Update rand requirement from 0.8 to 0.9 in /codec (#106)

* Update rand requirement from 0.8 to 0.9 in /codec Updates the requirements on [rand](https://github.com/rust-random/rand) to permit the latest version. - [Release notes](https://github.com/rust-random/rand/releases) - [Changelog](https://github.com/rust-random/rand/blob/master/CHANGELOG.md) - [Commits](rust-random/rand@0.8.0...0.9.0) --- updated-dependencies: - dependency-name: rand dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Update code to use updated dependency --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johanna Sörngård <[email protected]>
JSorngard · Jan 27, 2025 · 31ef9a0 · 31ef9a0
1 parent 475b635
commit 31ef9a0
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/codec/Cargo.toml b/codec/Cargo.toml
@@ -22,7 +22,7 @@ cli-clipboard = { version = "0.4", default-features = false, optional = true }
 clap = { version = "4.5", default-features = false, features = ["derive", "help", "color", "error-context", "suggestions", "usage"], optional = true }
 
 [dev-dependencies]
-rand = { version = "0.8", default-features = false, features = ["alloc", "std", "std_rng"] }
+rand = { version = "0.9", default-features = false, features = ["alloc", "std", "std_rng", "thread_rng"] }
 unicode-segmentation = { version = "1.12", features = ["no_std"] }
 
 [features]

diff --git a/codec/src/lib.rs b/codec/src/lib.rs
@@ -201,8 +201,8 @@ mod tests {
     use alloc::string::String;
     use core::str;
     use rand::{
-        distributions::{DistString, Distribution},
-        seq::SliceRandom,
+        distr::{Distribution, SampleString},
+        seq::IndexedRandom,
         Rng,
     };
     use unicode_segmentation::UnicodeSegmentation;
@@ -215,7 +215,7 @@ mod tests {
         }
     }
 
-    impl DistString for PrintableAsciiAndNewline {
+    impl SampleString for PrintableAsciiAndNewline {
         fn append_string<R: Rng + ?Sized>(&self, rng: &mut R, string: &mut String, len: usize) {
             string.reserve(len);
             for _ in 0..len {
@@ -276,7 +276,7 @@ mod tests {
 
         // Checking that randomly generated alphanumeric strings are encoded in a lossless fashion, and that they contain a single grapheme cluster
         for _ in 0..100 {
-            let s = PrintableAsciiAndNewline.sample_string(&mut rand::thread_rng(), 100);
+            let s = PrintableAsciiAndNewline.sample_string(&mut rand::rng(), 100);
             let encoded = zalgo_encode(&s).unwrap();
             assert_eq!(zalgo_decode(&encoded).unwrap(), s);
             assert_eq!(encoded.as_str().graphemes(true).count(), 1)

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -18,7 +18,7 @@ rkyv = { version = "0.8", default-features = false, features = ["alloc"], option
 
 [dev-dependencies]
 criterion = { version = "0.5", default-features = false, features = ["html_reports"] }
-rand = { version = "0.9", default-features = false }
+rand = { version = "0.9", default-features = false, features = ["thread_rng"]}
 
 [package.metadata.docs.rs]
 # Document all features.

diff --git a/common/benches/codec_bench.rs b/common/benches/codec_bench.rs
@@ -2,9 +2,10 @@ use std::hint::black_box;
 
 use criterion::{criterion_group, criterion_main, Criterion};
 use rand::{
-    distributions::{DistString, Distribution},
-    seq::SliceRandom,
-    thread_rng, Rng,
+    distr::{Distribution, SampleString},
+    rng,
+    seq::IndexedRandom,
+    Rng,
 };
 use zalgo_codec_common::{zalgo_decode, zalgo_encode, ZalgoString};
 
@@ -16,7 +17,7 @@ impl Distribution<char> for PrintableAsciiAndNewline {
     }
 }
 
-impl DistString for PrintableAsciiAndNewline {
+impl SampleString for PrintableAsciiAndNewline {
     fn append_string<R: Rng + ?Sized>(&self, rng: &mut R, string: &mut String, len: usize) {
         string.reserve(len);
         for _ in 0..len {
@@ -26,7 +27,7 @@ impl DistString for PrintableAsciiAndNewline {
 }
 
 fn bench_codec(c: &mut Criterion) {
-    let string = PrintableAsciiAndNewline.sample_string(&mut thread_rng(), 100_000);
+    let string = PrintableAsciiAndNewline.sample_string(&mut rng(), 100_000);
 
     let mut group = c.benchmark_group("codec");
     group.bench_function("encode", |b| {