align dependencies with Gecko (#57)

* upgrade to bincode 1.0
* switch from ordered-float to new-ordered-float
* upgrade to lmdb 0.8
without.crypto
Myk Melez 6 years ago committed by GitHub
parent 31c2020c4b
commit 8c2cc37936
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .rustfmt.toml
  2. 6
      .travis.yml
  3. 6
      Cargo.toml
  4. 4
      src/env.rs
  5. 7
      src/integer.rs
  6. 19
      src/value.rs

@ -1,4 +1,4 @@
imports_layout = "Vertical"
max_width = 120
match_block_trailing_comma = true
use_small_heuristics = false
use_small_heuristics = "Off"

@ -9,11 +9,11 @@ matrix:
- rust: nightly
fast_finish: true
before_script:
- rustup toolchain install nightly-2018-06-18
- rustup component add rustfmt-preview --toolchain nightly-2018-06-18
- rustup toolchain install nightly-2018-07-18
- rustup component add rustfmt-preview --toolchain nightly-2018-07-18
- command -v rustfmt || cargo install --force rustfmt-nightly
script:
- cargo +nightly-2018-06-18 fmt --all -- --check
- cargo +nightly-2018-07-18 fmt --all -- --check
- cargo build --verbose
- cargo test --verbose
- ./run-all-examples.sh

@ -16,10 +16,10 @@ backtrace = ["failure/backtrace", "failure/std"]
[dependencies]
arrayref = "0.3"
bincode = "0.9"
bincode = "1.0"
lazy_static = "1.0"
lmdb = "0.7"
ordered-float = "0.5"
lmdb = "0.8"
new-ordered-float = "1.0"
uuid = "0.5"
serde = "1.0"
url = "1.7.0"

@ -104,7 +104,7 @@ impl Rkv {
K: PrimitiveInt,
{
let mut flags = DatabaseFlags::empty();
flags.toggle(lmdb::INTEGER_KEY);
flags.toggle(DatabaseFlags::INTEGER_KEY);
let db = self.env.create_db(name.into(), flags).map_err(|e| match e {
lmdb::Error::BadRslot => StoreError::open_during_transaction(),
_ => e.into(),
@ -453,7 +453,7 @@ mod tests {
let root = Builder::new().prefix("test_delete_value").tempdir().expect("tempdir");
fs::create_dir_all(root.path()).expect("dir created");
let k = Rkv::new(root.path()).expect("new succeeded");
let sk: Store<&str> = k.open_or_create_with_flags("sk", lmdb::DUP_SORT).expect("opened");
let sk: Store<&str> = k.open_or_create_with_flags("sk", DatabaseFlags::DUP_SORT).expect("opened");
let mut writer = sk.write(&k).expect("writer");
writer.put("foo", &Value::I64(1234)).expect("wrote");

@ -10,10 +10,7 @@
use std::marker::PhantomData;
use bincode::{
serialize,
Infinite,
};
use bincode::serialize;
use lmdb::{
Database,
@ -50,7 +47,7 @@ where
T: Serialize,
{
fn to_bytes(&self) -> Result<Vec<u8>, DataError> {
serialize(self, Infinite) // TODO: limited key length.
serialize(self) // TODO: limited key length.
.map_err(|e| e.into())
}
}

@ -13,7 +13,6 @@ use ordered_float::OrderedFloat;
use bincode::{
deserialize,
serialize,
Infinite,
};
use uuid::{
@ -168,17 +167,17 @@ impl<'s> Value<'s> {
pub fn to_bytes(&self) -> Result<Vec<u8>, DataError> {
match self {
&Value::Bool(ref v) => serialize(&(Type::Bool.to_tag(), *v), Infinite),
&Value::U64(ref v) => serialize(&(Type::U64.to_tag(), *v), Infinite),
&Value::I64(ref v) => serialize(&(Type::I64.to_tag(), *v), Infinite),
&Value::F64(ref v) => serialize(&(Type::F64.to_tag(), v.0), Infinite),
&Value::Instant(ref v) => serialize(&(Type::Instant.to_tag(), *v), Infinite),
&Value::Str(ref v) => serialize(&(Type::Str.to_tag(), v), Infinite),
&Value::Json(ref v) => serialize(&(Type::Json.to_tag(), v), Infinite),
&Value::Blob(ref v) => serialize(&(Type::Blob.to_tag(), v), Infinite),
&Value::Bool(ref v) => serialize(&(Type::Bool.to_tag(), *v)),
&Value::U64(ref v) => serialize(&(Type::U64.to_tag(), *v)),
&Value::I64(ref v) => serialize(&(Type::I64.to_tag(), *v)),
&Value::F64(ref v) => serialize(&(Type::F64.to_tag(), v.0)),
&Value::Instant(ref v) => serialize(&(Type::Instant.to_tag(), *v)),
&Value::Str(ref v) => serialize(&(Type::Str.to_tag(), v)),
&Value::Json(ref v) => serialize(&(Type::Json.to_tag(), v)),
&Value::Blob(ref v) => serialize(&(Type::Blob.to_tag(), v)),
&Value::Uuid(ref v) => {
// Processed above to avoid verbose duplication of error transforms.
serialize(&(Type::Uuid.to_tag(), v), Infinite)
serialize(&(Type::Uuid.to_tag(), v))
},
}.map_err(DataError::EncodingError)
}

Loading…
Cancel
Save