Upgrade dev-deps to rand 0.9

Author: cuviper

Cargo.toml

@@ -35,5 +35,5 @@ default-features = false
 web_spin_lock = ["dep:wasm_sync", "rayon-core/web_spin_lock"]
 
 [dev-dependencies]
-rand = "0.8"
-rand_xorshift = "0.3"
+rand = "0.9"
+rand_xorshift = "0.4"

ci/compat-Cargo.lock

@@ -30,8 +30,8 @@ wasm_sync = { version = "0.1.0", optional = true }
 web_spin_lock = ["dep:wasm_sync"]
 
 [dev-dependencies]
-rand = "0.8"
-rand_xorshift = "0.3"
+rand = "0.9"
+rand_xorshift = "0.4"
 scoped-tls = "1.0"
 
 [target.'cfg(unix)'.dev-dependencies]

rayon-core/Cargo.toml

@@ -2,7 +2,7 @@
 
 use super::*;
 use crate::ThreadPoolBuilder;
-use rand::distributions::Standard;
+use rand::distr::StandardUniform;
 use rand::{Rng, SeedableRng};
 use rand_xorshift::XorShiftRng;
 
@@ -38,7 +38,7 @@ fn seeded_rng() -> XorShiftRng {
 #[test]
 fn sort() {
     let rng = seeded_rng();
-    let mut data: Vec<u32> = rng.sample_iter(&Standard).take(6 * 1024).collect();
+    let mut data: Vec<u32> = rng.sample_iter(&StandardUniform).take(6 * 1024).collect();
     let mut sorted_data = data.clone();
     sorted_data.sort();
     quick_sort(&mut data);
@@ -49,7 +49,7 @@ fn sort() {
 #[cfg_attr(any(target_os = "emscripten", target_family = "wasm"), ignore)]
 fn sort_in_pool() {
     let rng = seeded_rng();
-    let mut data: Vec<u32> = rng.sample_iter(&Standard).take(12 * 1024).collect();
+    let mut data: Vec<u32> = rng.sample_iter(&StandardUniform).take(12 * 1024).collect();
 
     let pool = ThreadPoolBuilder::new().build().unwrap();
     let mut sorted_data = data.clone();

rayon-core/src/join/test.rs

@@ -119,13 +119,13 @@ fn random_tree1(depth: usize, rng: &mut XorShiftRng) -> Tree<u32> {
     let children = if depth == 0 {
         vec![]
     } else {
-        (0..rng.gen_range(0..4)) // somewhere between 0 and 3 children at each level
+        (0..rng.random_range(0..4)) // somewhere between 0 and 3 children at each level
             .map(|_| random_tree1(depth - 1, rng))
             .collect()
     };
 
     Tree {
-        value: rng.gen_range(0..1_000_000),
+        value: rng.random_range(0..1_000_000),
         children,
     }
 }

rayon-core/src/scope/test.rs

@@ -13,8 +13,8 @@ docopt = "1"
 fixedbitset = "0.5"
 glium = "0.36"
 once_cell = "1.17.1"
-rand = "0.8"
-rand_xorshift = "0.3"
+rand = "0.9"
+rand_xorshift = "0.4"
 regex = "1"
 winit = "0.30"
 

rayon-demo/Cargo.toml

@@ -4,14 +4,14 @@ macro_rules! make_tests {
     ($n:expr, $m:ident) => {
         mod $m {
             use once_cell::sync::Lazy;
-            use rand::distributions::Standard;
+            use rand::distr::StandardUniform;
             use rand::Rng;
             use rayon::prelude::*;
             use test::Bencher;
 
             static HAYSTACK: Lazy<Box<[[u32; $n]]>> = Lazy::new(|| {
                 let rng = crate::seeded_rng();
-                rng.sample_iter(&Standard)
+                rng.sample_iter(&StandardUniform)
                     .map(|x| {
                         let mut result: [u32; $n] = [0; $n];
                         result[0] = x;

rayon-demo/src/find/mod.rs

@@ -16,8 +16,8 @@ Options:
 ";
 
 use crate::cpu_time::{self, CpuMeasure};
-use rand::distributions::Standard;
-use rand::{thread_rng, Rng};
+use rand::distr::StandardUniform;
+use rand::{rng, Rng};
 use std::iter::repeat;
 use std::sync::Arc;
 use std::thread;
@@ -90,8 +90,8 @@ impl Board {
     }
 
     pub fn random(&self) -> Board {
-        let new_brd = thread_rng()
-            .sample_iter(&Standard)
+        let new_brd = rng()
+            .sample_iter(&StandardUniform)
             .take(self.len())
             .collect();
 

rayon-demo/src/life/mod.rs

@@ -1,4 +1,4 @@
-use rand::distributions::Standard;
+use rand::distr::StandardUniform;
 use rand::Rng;
 
 const USAGE: &str = "
@@ -236,7 +236,7 @@ pub fn is_sorted<T: Send + Ord>(v: &mut [T]) -> bool {
 
 fn default_vec(n: usize) -> Vec<u32> {
     let rng = crate::seeded_rng();
-    rng.sample_iter(&Standard).take(n).collect()
+    rng.sample_iter(&StandardUniform).take(n).collect()
 }
 
 fn timed_sort<F: FnOnce(&mut [u32])>(n: usize, f: F, name: &str) -> u64 {

rayon-demo/src/mergesort/mod.rs

@@ -52,25 +52,25 @@ impl NBodyBenchmark {
     pub fn new<R: Rng>(num_bodies: usize, rng: &mut R) -> NBodyBenchmark {
         let bodies0: Vec<_> = (0..num_bodies)
             .map(|_| {
-                let r = rng.gen_range(0.0..10_000.0);
-                let theta = rng.gen_range(0.0..PI);
-                let phi = rng.gen_range(0.0..2.0 * PI);
+                let r = rng.random_range(0.0..10_000.0);
+                let theta = rng.random_range(0.0..PI);
+                let phi = rng.random_range(0.0..2.0 * PI);
                 let position = Point3 {
                     x: r * theta.sin() * phi.cos(),
                     y: r * theta.sin() * phi.sin(),
                     z: r * theta.cos(),
                 };
 
                 let velocity = Vector3 {
-                    x: rng.gen_range(-0.5..0.5) * INITIAL_VELOCITY,
-                    y: rng.gen_range(-0.5..0.5) * INITIAL_VELOCITY,
-                    z: rng.gen::<f64>() * INITIAL_VELOCITY + 10.0,
+                    x: rng.random_range(-0.5..0.5) * INITIAL_VELOCITY,
+                    y: rng.random_range(-0.5..0.5) * INITIAL_VELOCITY,
+                    z: rng.random::<f64>() * INITIAL_VELOCITY + 10.0,
                 };
 
                 let velocity2 = Vector3 {
-                    x: rng.gen_range(-0.5..0.5) * INITIAL_VELOCITY,
-                    y: rng.gen_range(-0.5..0.5) * INITIAL_VELOCITY,
-                    z: rng.gen::<f64>() * INITIAL_VELOCITY,
+                    x: rng.random_range(-0.5..0.5) * INITIAL_VELOCITY,
+                    y: rng.random_range(-0.5..0.5) * INITIAL_VELOCITY,
+                    z: rng.random::<f64>() * INITIAL_VELOCITY,
                 };
 
                 Body {

rayon-demo/src/nbody/nbody.rs

@@ -191,7 +191,7 @@ pub fn visualize_benchmarks(num_bodies: usize, mode: ExecutionMode) {
         .with_title("nbody demo")
         .build(&event_loop);
 
-    let benchmark = NBodyBenchmark::new(num_bodies, &mut rand::thread_rng());
+    let benchmark = NBodyBenchmark::new(num_bodies, &mut rand::rng());
 
     let vertex_shader_src = r#"
         #version 100
@@ -231,9 +231,9 @@ pub fn visualize_benchmarks(num_bodies: usize, mode: ExecutionMode) {
     let instances: Vec<_> = (0..num_bodies)
         .map(|_| Instance {
             color: [
-                rng.gen_range(0.5..1.0),
-                rng.gen_range(0.5..1.0),
-                rng.gen_range(0.5..1.0),
+                rng.random_range(0.5..1.0),
+                rng.random_range(0.5..1.0),
+                rng.random_range(0.5..1.0),
             ],
             world_position: [0.0, 0.0, 0.0],
         })

rayon-demo/src/nbody/visualize.rs

@@ -23,7 +23,7 @@ pub struct Args {
 }
 
 use docopt::Docopt;
-use rand::distributions::Standard;
+use rand::distr::StandardUniform;
 use rand::Rng;
 use std::time::Instant;
 
@@ -108,7 +108,7 @@ pub fn is_sorted<T: Send + Ord>(v: &[T]) -> bool {
 
 fn default_vec(n: usize) -> Vec<u32> {
     let rng = crate::seeded_rng();
-    rng.sample_iter(&Standard).take(n).collect()
+    rng.sample_iter(&StandardUniform).take(n).collect()
 }
 
 fn timed_sort<F: FnOnce(&mut [u32])>(n: usize, f: F, name: &str) -> u64 {