Skip to content

Commit 9418e8e

Browse files
authored
Update rand crate dependencies (#13060)
* Update `rand` crate dependencies Purge rand 0.8 and 0.9 from our dependency tree, unify on rand 0.10, and update to versions that fix known documented issues with the prior versions we were using. This additionally removes the `cap-rand` crate since that's not updated yet and I don't think the crate is doing much over the `rand` crate itself. Closes #13057 Closes #13058 * Update cargo deny configuration
1 parent 4364d38 commit 9418e8e

36 files changed

Lines changed: 444 additions & 170 deletions

File tree

Cargo.lock

Lines changed: 227 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,6 @@ wasip1 = { version = "1.0.0", default-features = false }
337337
# cap-std family:
338338
target-lexicon = "0.13.0"
339339
cap-std = "3.4.5"
340-
cap-rand = { version = "3.4.5", features = ["small_rng"] }
341340
cap-fs-ext = "3.4.5"
342341
cap-net-ext = "3.4.5"
343342
cap-time-ext = "3.4.5"
@@ -399,7 +398,7 @@ mach2 = "0.4.2"
399398
memfd = "0.6.5"
400399
psm = "0.1.11"
401400
proptest = "1.0.0"
402-
rand = { version = "0.9.2", features = ["small_rng"] }
401+
rand = { version = "0.10.1", default-features = false }
403402
# serde and serde_derive must have the same version
404403
serde = { version = "1.0.228", default-features = false, features = ['alloc'] }
405404
serde_derive = "1.0.228"

benches/compile_time_builtins.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ mod inc_list {
474474

475475
mod inc_random {
476476
use super::*;
477-
use rand::{Rng, SeedableRng as _};
477+
use rand::{RngExt, SeedableRng as _};
478478

479479
pub fn bench(c: &mut Criterion) {
480480
let mut g = c.benchmark_group("increment-random-byte-in-buf");

cranelift/codegen/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ gimli = { workspace = true, features = ["write"], optional = true }
4141
smallvec = { workspace = true }
4242
regalloc2 = { workspace = true, features = ["checker"] }
4343
souper-ir = { version = "2.1.0", optional = true }
44-
sha2 = { version = "0.10.2", optional = true }
44+
sha2 = { workspace = true, optional = true }
4545
rustc-hash = { workspace = true }
4646
wasmtime-core = { workspace = true }
4747
libm = { workspace = true }

cranelift/fuzzgen/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use cranelift::prelude::settings::SettingKind;
1313
use cranelift::prelude::*;
1414
use cranelift_arbitrary::CraneliftArbitrary;
1515
use cranelift_native::builder_with_options;
16-
use rand::{Rng, SeedableRng, rngs::SmallRng};
16+
use rand::{RngExt, SeedableRng, rngs::SmallRng};
1717
use target_isa_extras::TargetIsaExtras;
1818
use target_lexicon::Architecture;
1919

crates/cache/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ directories-next = "2.0"
1919
log = { workspace = true }
2020
serde = { workspace = true }
2121
serde_derive = { workspace = true }
22-
sha2 = { workspace = true, features = ['std'] }
22+
sha2 = { workspace = true }
2323
toml = { workspace = true }
2424
zstd = { version = "0.13.0", default-features = false }
2525
wasmtime-environ = { workspace = true }

crates/fuzzing/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ v8 = "139.0.0"
7070

7171
[dev-dependencies]
7272
wat = { workspace = true }
73-
rand = { version = "0.8.0", features = ["small_rng"] }
73+
rand = { workspace = true }
7474
wasmtime-environ = { workspace = true }
7575
cranelift-bforest = { workspace = true }
7676
cranelift-bitset = { workspace = true }

crates/fuzzing/src/generators/gc_ops/tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::generators::gc_ops::{
55
};
66
use mutatis;
77
use rand::rngs::StdRng;
8-
use rand::{Rng, SeedableRng};
8+
use rand::{RngExt, SeedableRng};
99
use wasmparser;
1010
use wasmprinter;
1111

@@ -101,7 +101,7 @@ fn test_ops(num_params: u32, num_globals: u32, table_size: u32) -> GcOps {
101101
let mut rng = StdRng::seed_from_u64(0xC0FFEE);
102102
if t.limits.max_rec_groups > 0 {
103103
for i in 0..t.limits.max_types {
104-
let gid = RecGroupId(rng.gen_range(0..t.limits.max_rec_groups));
104+
let gid = RecGroupId(rng.random_range(0..t.limits.max_rec_groups));
105105
let is_final = false;
106106
let supertype = None;
107107
t.types

crates/fuzzing/src/single_module_fuzzer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ fn extract_fuzz_input(data: &[u8]) -> wasmtime::Result<FuzzInput<'_>> {
274274
mod tests {
275275
use super::*;
276276
use rand::rngs::SmallRng;
277-
use rand::{RngCore, SeedableRng};
277+
use rand::{Rng, SeedableRng};
278278

279279
#[test]
280280
fn changing_configuration_does_not_change_module() {

crates/test-programs/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ wit-bindgen = { workspace = true, features = ['default', 'async-spawn', 'inter-t
1717
libc = { workspace = true }
1818
futures = { workspace = true, default-features = false, features = ['alloc', 'async-await'] }
1919
url = { workspace = true }
20-
sha2 = { workspace = true, features = ['std'] }
20+
sha2 = { workspace = true }
2121
base64 = { workspace = true }
2222
wasip1 = { version = "1.0.0", default-features = true }
2323
wasip2 = "1.0.0"

0 commit comments

Comments
 (0)