From 0f78f6be5962e8b78e00c0c88085e84267e552ba Mon Sep 17 00:00:00 2001 From: Riccardo Mazzarini Date: Sun, 6 Jul 2025 17:58:05 +0200 Subject: [PATCH] Update deps --- Cargo.toml | 8 ++++---- tests/common/mod.rs | 17 +++++++++-------- tests/serde.rs | 16 ++++++++++++++-- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8627e9a..e883ccf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,10 +26,10 @@ sha2 = { version = "0.10", optional = true } varint-simd = { version = "0.4", optional = true } [dev-dependencies] -bincode = "1.3" -criterion = "0.5" -rand = "0.8" -rand_chacha = "0.3" +bincode = { version = "2", features = ["serde"] } +criterion = "0.6" +rand = "0.9" +rand_chacha = "0.9" serde_json = "1" traces = { path = "./traces" } zstd = "0.13" diff --git a/tests/common/mod.rs b/tests/common/mod.rs index 9e57b7e..05fdd8d 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -141,8 +141,9 @@ impl Replica { max_len: usize, rng: &mut impl Rng, ) -> Self { - let string = - (0..max_len).map(|_| rng.gen_range('a'..='z')).collect::(); + let string = (0..max_len) + .map(|_| rng.random_range('a'..='z')) + .collect::(); Self::new(id, string) } @@ -152,9 +153,9 @@ impl Replica { max_len: usize, ) -> (usize, String) { assert!(max_len > 0); - let offset = rng.gen_range(0..=self.buffer.len()); - let text_len = rng.gen_range(1..=max_len); - let letter = rng.gen_range('a'..='z'); + let offset = rng.random_range(0..=self.buffer.len()); + let text_len = rng.random_range(1..=max_len); + let letter = rng.random_range('a'..='z'); let text = (0..text_len).map(|_| letter).collect::(); (offset, text) } @@ -166,9 +167,9 @@ impl Replica { ) -> Range { assert!(!self.buffer.is_empty()); - let start = rng.gen_range(0..self.buffer.len()); + let start = rng.random_range(0..self.buffer.len()); - let len = rng.gen_range(1..=max_len); + let len = rng.random_range(1..=max_len); let end = if start + len > self.buffer.len() { self.buffer.len() @@ -185,7 +186,7 @@ impl Replica { max_insertion_len: usize, max_deletion_len: usize, ) -> RandomEdit { - let create_insertion = rng.gen::() || self.buffer.is_empty(); + let create_insertion = rng.random::() || self.buffer.is_empty(); if create_insertion { let (offset, text) = self.random_insert(rng, max_insertion_len); diff --git a/tests/serde.rs b/tests/serde.rs index 1ed53fd..ece2331 100644 --- a/tests/serde.rs +++ b/tests/serde.rs @@ -35,15 +35,27 @@ mod serde { struct Bincode; + impl Bincode { + const fn config() -> impl bincode::config::Config { + bincode::config::standard() + .with_little_endian() + .with_variable_int_encoding() + } + } + impl Encoder for Bincode { const NAME: &'static str = "bincode"; fn encode(value: &T) -> Vec { - bincode::serialize(value).unwrap() + bincode::serde::encode_to_vec(value, Self::config()).unwrap() } fn decode(buf: Vec) -> T { - bincode::deserialize(&buf).unwrap() + let (decoded, num_read) = + bincode::serde::decode_from_slice(&buf, Self::config()) + .unwrap(); + assert_eq!(num_read, buf.len()); + decoded } }