Skip to content

Commit 61cc058

Browse files
committed
Upgrade to rand 0.8.3
Signed-off-by: Chojan Shang <[email protected]>
1 parent 805b5e2 commit 61cc058

File tree

3 files changed

+21
-9
lines changed

3 files changed

+21
-9
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ bumpalo = { version = "3.5.0", optional = true }
2929

3030
[dev-dependencies]
3131
lazy_static = "1.4"
32-
rand = { version = "0.7.3", features = ["small_rng"] }
32+
rand = { version = "0.8.3", features = ["small_rng"] }
3333
rayon = "1.0"
3434
fnv = "1.0.7"
3535
serde_test = "1.0"

src/map.rs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4277,18 +4277,21 @@ mod test_map {
42774277
let mut m = HashMap::new();
42784278

42794279
let mut rng = {
4280-
let seed = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16];
4280+
let seed = [
4281+
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, // and again
4282+
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
4283+
];
42814284
SmallRng::from_seed(seed)
42824285
};
42834286

42844287
// Populate the map with some items.
42854288
for _ in 0..50 {
4286-
let x = rng.gen_range(-10, 10);
4289+
let x = rng.gen_range(-10..10);
42874290
m.insert(x, ());
42884291
}
42894292

42904293
for _ in 0..1000 {
4291-
let x = rng.gen_range(-10, 10);
4294+
let x = rng.gen_range(-10..10);
42924295
match m.entry(x) {
42934296
Vacant(_) => {}
42944297
Occupied(e) => {
@@ -4587,18 +4590,21 @@ mod test_map {
45874590
let mut m = HashMap::new();
45884591

45894592
let mut rng = {
4590-
let seed = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16];
4593+
let seed = [
4594+
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, // and again
4595+
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
4596+
];
45914597
SmallRng::from_seed(seed)
45924598
};
45934599

45944600
// Populate the map with some items.
45954601
for _ in 0..50 {
4596-
let x = rng.gen_range(-10, 10);
4602+
let x = rng.gen_range(-10..10);
45974603
m.insert(x, ());
45984604
}
45994605

46004606
for _ in 0..1000 {
4601-
let x = rng.gen_range(-10, 10);
4607+
let x = rng.gen_range(-10..10);
46024608
m.entry(x).and_replace_entry_with(|_, _| None);
46034609
check(&m);
46044610
}

tests/set.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,19 @@ fn test_hashset_insert_remove() {
88
let mut m: HashSet<Vec<char>> = HashSet::new();
99
//let num: u32 = 4096;
1010
//let tx: Vec<Vec<u8>> = (0..num).map(|i| (i..(16 + i)).collect()).collect();
11-
let seed: [u8; 16] = [
11+
let seed: [u8; 32] = [
12+
130, 220, 246, 217, 111, 124, 221, 189, 190, 234, 121, 93, 67, 95, 100, 43, // again
1213
130, 220, 246, 217, 111, 124, 221, 189, 190, 234, 121, 93, 67, 95, 100, 43,
1314
];
1415

1516
let rng = &mut SmallRng::from_seed(seed);
1617
let tx: Vec<Vec<char>> = (0..4096)
17-
.map(|_| (rng.sample_iter(&Alphanumeric).take(32).collect()))
18+
.map(|_| {
19+
rng.sample_iter(&Alphanumeric)
20+
.take(32)
21+
.map(char::from)
22+
.collect()
23+
})
1824
.collect();
1925

2026
for _ in 0..32 {

0 commit comments

Comments
 (0)