Switch to fastrand for bench shuffling

Author: cuviper

Cargo.toml

@@ -30,7 +30,7 @@ default-features = false
 
 [dev-dependencies]
 itertools = "0.14"
-rand = {version = "0.9", features = ["small_rng"] }
+fastrand = { version = "2", default-features = false }
 quickcheck = { version = "1.0", default-features = false }
 fnv = "1.0"
 lazy_static = "1.3"

benches/bench.rs

@@ -16,14 +16,10 @@ use indexmap::IndexMap;
 
 use std::collections::HashMap;
 
-use rand::rngs::SmallRng;
-use rand::seq::SliceRandom;
-use rand::SeedableRng;
-
 /// Use a consistently seeded Rng for benchmark stability
-fn small_rng() -> SmallRng {
+fn small_rng() -> fastrand::Rng {
     let seed = u64::from_le_bytes(*b"indexmap");
-    SmallRng::seed_from_u64(seed)
+    fastrand::Rng::with_seed(seed)
 }
 
 #[bench]
@@ -280,7 +276,7 @@ where
 {
     let mut v = Vec::from_iter(iter);
     let mut rng = small_rng();
-    v.shuffle(&mut rng);
+    rng.shuffle(&mut v);
     v
 }
 
@@ -523,7 +519,7 @@ fn hashmap_merge_shuffle(b: &mut Bencher) {
     b.iter(|| {
         let mut merged = first_map.clone();
         v.extend(second_map.iter().map(|(&k, &v)| (k, v)));
-        v.shuffle(&mut rng);
+        rng.shuffle(&mut v);
         merged.extend(v.drain(..));
 
         merged
@@ -550,7 +546,7 @@ fn indexmap_merge_shuffle(b: &mut Bencher) {
     b.iter(|| {
         let mut merged = first_map.clone();
         v.extend(second_map.iter().map(|(&k, &v)| (k, v)));
-        v.shuffle(&mut rng);
+        rng.shuffle(&mut v);
         merged.extend(v.drain(..));
 
         merged
@@ -562,7 +558,7 @@ fn swap_remove_indexmap_100_000(b: &mut Bencher) {
     let map = IMAP_100K.clone();
     let mut keys = Vec::from_iter(map.keys().copied());
     let mut rng = small_rng();
-    keys.shuffle(&mut rng);
+    rng.shuffle(&mut keys);
 
     b.iter(|| {
         let mut map = map.clone();
@@ -579,7 +575,7 @@ fn shift_remove_indexmap_100_000_few(b: &mut Bencher) {
     let map = IMAP_100K.clone();
     let mut keys = Vec::from_iter(map.keys().copied());
     let mut rng = small_rng();
-    keys.shuffle(&mut rng);
+    rng.shuffle(&mut keys);
     keys.truncate(50);
 
     b.iter(|| {
@@ -600,7 +596,7 @@ fn shift_remove_indexmap_2_000_full(b: &mut Bencher) {
         map.insert(key, key);
     }
     let mut rng = small_rng();
-    keys.shuffle(&mut rng);
+    rng.shuffle(&mut keys);
 
     b.iter(|| {
         let mut map = map.clone();

benches/faststring.rs

@@ -8,19 +8,15 @@ use indexmap::IndexMap;
 
 use std::collections::HashMap;
 
-use rand::rngs::SmallRng;
-use rand::seq::SliceRandom;
-use rand::SeedableRng;
-
 use std::hash::{Hash, Hasher};
 
 use std::borrow::Borrow;
 use std::ops::Deref;
 
 /// Use a consistently seeded Rng for benchmark stability
-fn small_rng() -> SmallRng {
+fn small_rng() -> fastrand::Rng {
     let seed = u64::from_le_bytes(*b"indexmap");
-    SmallRng::seed_from_u64(seed)
+    fastrand::Rng::with_seed(seed)
 }
 
 #[derive(PartialEq, Eq, Copy, Clone)]
@@ -68,7 +64,7 @@ where
 {
     let mut v = Vec::from_iter(iter);
     let mut rng = small_rng();
-    v.shuffle(&mut rng);
+    rng.shuffle(&mut v);
     v
 }