Fix!: Update dependency 'rand' loosing isize generator.

Updating dependencies `rand` and `rand_chacha` to the latest version.

BREAKING CHANGE: Monkey Test is loosing built in generators
for type `isize`, since supported is removed in underlying lib rand.
For details, see https://rust-random.github.io/book/update-0.9.html

Author: jockbert

Cargo.toml

@@ -18,8 +18,8 @@ maintenance = { status = "actively-developed" }
 
 [dependencies]
 num-traits = "0.2"
-rand = "0.8.5"
-rand_chacha = "0.3.1"
+rand = "0.9.2"
+rand_chacha = "0.9.0"
 panic-message = "0.3.0"
 
 [dev-dependencies]

DOCUMENTATION.md

@@ -185,7 +185,7 @@ struct DiceGen {
 impl Gen<u32> for DiceGen {
     fn examples(&self, seed: u64) -> BoxIter<u32> {
         let distr =
-            rand::distributions::Uniform::new_inclusive(1, self.side_count);
+            rand::distr::Uniform::new_inclusive(1, self.side_count).unwrap();
         let iter =
             rand_chacha::ChaCha8Rng::seed_from_u64(seed).sample_iter(distr);
         Box::new(iter)
@@ -212,7 +212,7 @@ use rand::SeedableRng;
 
 fn dice_throw_generator_from_fn(side_count: u32) -> BoxGen<u32> {
     gens::from_fn(move |seed| {
-        let distr = rand::distributions::Uniform::new_inclusive(1, side_count);
+        let distr = rand::distr::Uniform::new_inclusive(1, side_count).unwrap();
         rand_chacha::ChaCha8Rng::seed_from_u64(seed).sample_iter(distr)
     })
     .with_shrinker(shrinks::int())

src/config.rs

@@ -67,7 +67,7 @@ impl Conf {
 
 /// The standard source to get randimization seed from.
 pub fn seed_to_use() -> u64 {
-    rand_chacha::ChaCha8Rng::from_entropy().next_u64()
+    rand_chacha::ChaCha8Rng::from_os_rng().next_u64()
 }
 
 impl Default for Conf {

src/gens.rs

@@ -77,7 +77,9 @@ integer_module!(i16);
 integer_module!(i32);
 integer_module!(i64);
 integer_module!(i128);
-integer_module!(isize);
+// Macro is not used for type isize, since not supported in underlying lib rand.
+// For details, see https://rust-random.github.io/book/update-0.9.html
+
 integer_module!(u8);
 integer_module!(u16);
 integer_module!(u32);

src/gens/float.rs

@@ -7,7 +7,7 @@ use crate::gens;
 use crate::BoxGen;
 use crate::MapWithGen;
 use num_traits::Float;
-use rand::distributions::uniform::SampleUniform;
+use rand::distr::uniform::SampleUniform;
 use rand::Rng;
 use rand::SeedableRng;
 use std::fmt::Debug;
@@ -146,10 +146,8 @@ where
     // Generate two's complement bits signed integer representation of finite
     // floats
     gens::from_fn(move |seed| {
-        //let distr = rand::distributions::Uniform::new_inclusive(min, max);
         let mut x = rand_chacha::ChaCha8Rng::seed_from_u64(seed);
-
-        std::iter::from_fn(move || Some(x.gen_range(min..=max)))
+        std::iter::from_fn(move || Some(x.random_range(min..=max)))
     })
     // Map to actual floats from two's complement bits
     .map(

src/gens/integer.rs

@@ -2,7 +2,7 @@
 
 use crate::BoxGen;
 use num_traits::PrimInt;
-use rand::distributions::uniform::SampleUniform;
+use rand::distr::uniform::SampleUniform;
 use rand::Rng;
 use rand::SeedableRng;
 use std::ops::Bound;
@@ -41,7 +41,8 @@ where
     let max = end(&bounds);
 
     crate::gens::from_fn(move |seed| {
-        let distr = rand::distributions::Uniform::new_inclusive(min, max);
+        let distr = rand::distr::Uniform::new_inclusive(min, max)
+            .expect("distribution from bounds");
         rand_chacha::ChaCha8Rng::seed_from_u64(seed).sample_iter(distr)
     })
     .with_shrinker(crate::shrinks::int_in_range(min, max))

src/gens/mix.rs

@@ -66,7 +66,7 @@ where
 {
     crate::gens::from_fn(move |seed| {
         let high = sample_target.sample_domain_max();
-        let distr = rand::distributions::Uniform::new_inclusive(1usize, high);
+        let distr = rand::distr::Uniform::new_inclusive(1usize, high).unwrap();
         let rng = rand_chacha::ChaCha8Rng::seed_from_u64(seed);
 
         let mut sample_iterators =
@@ -177,7 +177,7 @@ mod test {
             (1, '4'),
         ]);
 
-        assert_generator_has_distribution_within_percent(mixer, expected, 1.0)
+        assert_generator_has_distribution_within_percent(mixer, expected, 1.5)
     }
 
     #[test]

src/gens/pick.rs

@@ -37,7 +37,7 @@ where
 {
     crate::gens::from_fn(move |seed| {
         let high = sample_target.sample_domain_max();
-        let distr = rand::distributions::Uniform::new_inclusive(1usize, high);
+        let distr = rand::distr::Uniform::new_inclusive(1usize, high).unwrap();
         let rng = rand_chacha::ChaCha8Rng::seed_from_u64(seed);
         let sample_target = sample_target.clone();
 

src/gens/sized.rs

@@ -5,7 +5,7 @@ use std::cmp::min;
 
 use crate::BoxGen;
 use crate::BoxIter;
-use rand::distributions::Uniform;
+use rand::distr::Uniform;
 use rand::Rng;
 use rand::SeedableRng;
 
@@ -43,8 +43,9 @@ pub fn progressively_increasing(
     crate::gens::from_fn(move |seed| {
         let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(seed);
 
-        max_iterator(start_size, percent_increase, max_size)
-            .map(move |max| rng.sample(Uniform::new_inclusive(0usize, max)))
+        max_iterator(start_size, percent_increase, max_size).map(move |max| {
+            rng.sample(Uniform::new_inclusive(0usize, max).unwrap())
+        })
     })
     .with_shrinker(crate::shrinks::int_to_zero())
 }
@@ -151,7 +152,7 @@ mod test {
         .sum::<usize>() as f64;
 
         let expected_sum = n as f64 * n as f64 / 4.0;
-        let diff = expected_sum * 0.005;
+        let diff = expected_sum * 0.010; // allow 1% difference
 
         assert_approx_eq!(sum_of_examples, expected_sum, diff);
     }

src/gens/vec.rs

@@ -20,38 +20,42 @@
 //!     vec![
 //!         vec![],
 //!         vec![9],
+//!         vec![9],
+//!         vec![9, 9],
 //!         vec![9, 9],
-//!         vec![9, 9, 9],
-//!         vec![9, 9, 9, 9],
-//!         vec![9, 9, 9],
-//!         vec![9, 9, 9, 9, 9, 9],
 //!         vec![9, 9, 9, 9, 9],
+//!         vec![9, 9],
 //!         vec![9, 9, 9, 9, 9, 9],
+//!         vec![9, 9, 9, 9],
+//!         vec![9, 9, 9, 9, 9, 9, 9, 9, 9, 9],
 //!         vec![9, 9, 9],
-//!         vec![9, 9, 9, 9, 9, 9, 9],
-//!         vec![9, 9, 9],
-//!         vec![9],
-//!         vec![9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9],
-//!         vec![9],
+//!         vec![9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9],
 //!
-//!         vec![9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9],
+//!         vec![9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+//!              9],
 //!
 //!         vec![9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-//!              9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+//!              9, 9, 9, 9, 9, 9],
+//!
+//!         vec![9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9],
+//!         vec![9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 //!              9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9],
 //!
 //!         vec![9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 //!              9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-//!              9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 //!              9],
 //!
 //!         vec![9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 //!              9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+//!              9, 9, 9, 9, 9, 9, 9, 9, 9],
+//!
+//!         vec![9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 //!              9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
 //!              9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-//!              9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9],
+//!              9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9],
 //!
-//!         vec![9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9]
+//!         vec![9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+//!              9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9]
 //!     ]
 //! };
 //! ```