diff --git a/Cargo.toml b/Cargo.toml index c65111d3..a2e71782 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,22 +25,22 @@ appveyor = { repository = "aerospike/aerospike-client-rust" } [dependencies] log = "0.4" byteorder = "1.3" -ripemd160 = "0.8" -base64 = "0.11" -crossbeam-queue = "0.2" -rand = "0.7" +ripemd160 = "0.9" +base64 = "0.13" +crossbeam-queue = "0.3" +rand = "0.8" scoped-pool = "1.0" lazy_static = "1.4" error-chain = "0.12" -parking_lot = "0.9" -pwhash = "0.3" +parking_lot = "0.11" +pwhash = "1.0" serde = { version = "1.0", features = ["derive"], optional = true } [features] serialization = ["serde"] [dev-dependencies] -env_logger = "0.7" +env_logger = "0.9" hex = "0.4" bencher = "0.1" serde_json = "1.0" diff --git a/src/key.rs b/src/key.rs index 834de227..f5c333cb 100644 --- a/src/key.rs +++ b/src/key.rs @@ -66,14 +66,14 @@ impl Key { fn compute_digest(&mut self) -> Result<()> { let mut hash = Ripemd160::new(); - hash.input(self.set_name.as_bytes()); + hash.update(self.set_name.as_bytes()); if let Some(ref user_key) = self.user_key { - hash.input(&[user_key.particle_type() as u8]); + hash.update(&[user_key.particle_type() as u8]); user_key.write_key_bytes(&mut hash)?; } else { unreachable!() } - self.digest = hash.result().into(); + self.digest = hash.finalize().into(); Ok(()) } diff --git a/src/query/recordset.rs b/src/query/recordset.rs index 02f348af..a6ec3b87 100644 --- a/src/query/recordset.rs +++ b/src/query/recordset.rs @@ -94,7 +94,7 @@ impl<'a> Iterator for &'a Recordset { fn next(&mut self) -> Option> { loop { if self.is_active() || !self.record_queue.is_empty() { - let result = self.record_queue.pop().ok(); + let result = self.record_queue.pop(); if result.is_some() { self.record_queue_count.fetch_sub(1, Ordering::Relaxed); return result; diff --git a/src/value.rs b/src/value.rs index 2f93ea00..8a5bd78e 100644 --- a/src/value.rs +++ b/src/value.rs @@ -309,15 +309,15 @@ impl Value { Value::Int(ref val) => { let mut buf = [0; 8]; NetworkEndian::write_i64(&mut buf, *val); - h.input(&buf); + h.update(&buf); Ok(()) } Value::String(ref val) => { - h.input(val.as_bytes()); + h.update(val.as_bytes()); Ok(()) } Value::Blob(ref val) => { - h.input(val); + h.update(val); Ok(()) } _ => panic!("Data type is not supported as Key value."), diff --git a/tests/common/mod.rs b/tests/common/mod.rs index 99a60829..4905973f 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -61,5 +61,8 @@ pub fn client() -> Arc { pub fn rand_str(sz: usize) -> String { let rng = rand::thread_rng(); - rng.sample_iter(&Alphanumeric).take(sz).collect() + rng.sample_iter(&Alphanumeric) + .map(char::from) + .take(sz) + .collect() }