Skip to content

Commit e546baa

Browse files
committed
Upgrade dev-deps to rand 0.9
(cherry picked from commit 2ca893b)
1 parent 03fb00f commit e546baa

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

rayon-core/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ crossbeam-deque = "0.8.1"
2222
crossbeam-utils = "0.8.0"
2323

2424
[dev-dependencies]
25-
rand = "0.8"
26-
rand_xorshift = "0.3"
25+
rand = "0.9"
26+
rand_xorshift = "0.4"
2727
scoped-tls = "1.0"
2828

2929
[target.'cfg(unix)'.dev-dependencies]

rayon-core/src/join/test.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use super::*;
44
use crate::ThreadPoolBuilder;
5-
use rand::distributions::Standard;
5+
use rand::distr::StandardUniform;
66
use rand::{Rng, SeedableRng};
77
use rand_xorshift::XorShiftRng;
88

@@ -38,7 +38,7 @@ fn seeded_rng() -> XorShiftRng {
3838
#[test]
3939
fn sort() {
4040
let rng = seeded_rng();
41-
let mut data: Vec<u32> = rng.sample_iter(&Standard).take(6 * 1024).collect();
41+
let mut data: Vec<u32> = rng.sample_iter(&StandardUniform).take(6 * 1024).collect();
4242
let mut sorted_data = data.clone();
4343
sorted_data.sort();
4444
quick_sort(&mut data);
@@ -49,7 +49,7 @@ fn sort() {
4949
#[cfg_attr(any(target_os = "emscripten", target_family = "wasm"), ignore)]
5050
fn sort_in_pool() {
5151
let rng = seeded_rng();
52-
let mut data: Vec<u32> = rng.sample_iter(&Standard).take(12 * 1024).collect();
52+
let mut data: Vec<u32> = rng.sample_iter(&StandardUniform).take(12 * 1024).collect();
5353

5454
let pool = ThreadPoolBuilder::new().build().unwrap();
5555
let mut sorted_data = data.clone();

rayon-core/src/scope/test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@ fn random_tree1(depth: usize, rng: &mut XorShiftRng) -> Tree<u32> {
119119
let children = if depth == 0 {
120120
vec![]
121121
} else {
122-
(0..rng.gen_range(0..4)) // somewhere between 0 and 3 children at each level
122+
(0..rng.random_range(0..4)) // somewhere between 0 and 3 children at each level
123123
.map(|_| random_tree1(depth - 1, rng))
124124
.collect()
125125
};
126126

127127
Tree {
128-
value: rng.gen_range(0..1_000_000),
128+
value: rng.random_range(0..1_000_000),
129129
children,
130130
}
131131
}

0 commit comments

Comments
 (0)