Skip to content

Commit 611458b

Browse files
authored
Rollup merge of #63806 - mati865:rand, r=alexcrichton
Upgrade rand to 0.7 Also upgrades `getrandom` to avoid bug encountered by #61393 which bumps libc to `0.2.62`.
2 parents 0b36e9d + 32101ad commit 611458b

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

Cargo.lock

+7-6
Original file line numberDiff line numberDiff line change
@@ -1139,12 +1139,13 @@ dependencies = [
11391139

11401140
[[package]]
11411141
name = "getrandom"
1142-
version = "0.1.8"
1142+
version = "0.1.12"
11431143
source = "registry+https://github.com/rust-lang/crates.io-index"
1144-
checksum = "34f33de6f0ae7c9cb5e574502a562e2b512799e32abb801cd1e79ad952b62b49"
1144+
checksum = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
11451145
dependencies = [
11461146
"cfg-if",
11471147
"libc",
1148+
"wasi",
11481149
]
11491150

11501151
[[package]]
@@ -1571,9 +1572,9 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
15711572

15721573
[[package]]
15731574
name = "libc"
1574-
version = "0.2.61"
1575+
version = "0.2.62"
15751576
source = "registry+https://github.com/rust-lang/crates.io-index"
1576-
checksum = "c665266eb592905e8503ba3403020f4b8794d26263f412ca33171600eca9a6fa"
1577+
checksum = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
15771578
dependencies = [
15781579
"rustc-std-workspace-core",
15791580
]
@@ -3232,7 +3233,7 @@ version = "0.0.0"
32323233
dependencies = [
32333234
"graphviz",
32343235
"log",
3235-
"rand 0.6.1",
3236+
"rand 0.7.0",
32363237
"rustc",
32373238
"rustc_data_structures",
32383239
"rustc_fs_util",
@@ -3848,7 +3849,7 @@ dependencies = [
38483849
"panic_abort",
38493850
"panic_unwind",
38503851
"profiler_builtins",
3851-
"rand 0.6.1",
3852+
"rand 0.7.0",
38523853
"rustc_asan",
38533854
"rustc_lsan",
38543855
"rustc_msan",

src/librustc_incremental/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ doctest = false
1212
[dependencies]
1313
graphviz = { path = "../libgraphviz" }
1414
log = "0.4"
15-
rand = "0.6"
15+
rand = "0.7"
1616
rustc = { path = "../librustc" }
1717
rustc_data_structures = { path = "../librustc_data_structures" }
1818
rustc_serialize = { path = "../libserialize", package = "serialize" }

src/libstd/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ features = [
3838
optional = true
3939

4040
[dev-dependencies]
41-
rand = "0.6.1"
41+
rand = "0.7"
4242

4343
[target.x86_64-apple-darwin.dependencies]
4444
rustc_asan = { path = "../librustc_asan" }

src/libstd/fs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2144,7 +2144,7 @@ mod tests {
21442144
use crate::sys_common::io::test::{TempDir, tmpdir};
21452145
use crate::thread;
21462146

2147-
use rand::{rngs::StdRng, FromEntropy, RngCore};
2147+
use rand::{rngs::StdRng, RngCore, SeedableRng};
21482148

21492149
#[cfg(windows)]
21502150
use crate::os::windows::fs::{symlink_dir, symlink_file};

src/libstd/tests/env.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use rand::{thread_rng, Rng};
55
use rand::distributions::Alphanumeric;
66

77
fn make_rand_name() -> OsString {
8-
let mut rng = thread_rng();
8+
let rng = thread_rng();
99
let n = format!("TEST{}", rng.sample_iter(&Alphanumeric).take(10)
1010
.collect::<String>());
1111
let n = OsString::from(n);

0 commit comments

Comments
 (0)