Skip to content

Commit 4428787

Browse files
authored
Rollup merge of rust-lang#63806 - mati865:rand, r=alexcrichton
Upgrade rand to 0.7 Also upgrades `getrandom` to avoid bug encountered by rust-lang#61393 which bumps libc to `0.2.62`. `wasi` crate was going to be added by rust-lang#63676 anyway.
2 parents 6187684 + 74b3548 commit 4428787

File tree

6 files changed

+18
-10
lines changed

6 files changed

+18
-10
lines changed

Cargo.lock

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,12 +1151,13 @@ dependencies = [
11511151

11521152
[[package]]
11531153
name = "getrandom"
1154-
version = "0.1.8"
1154+
version = "0.1.11"
11551155
source = "registry+https://github.com/rust-lang/crates.io-index"
1156-
checksum = "34f33de6f0ae7c9cb5e574502a562e2b512799e32abb801cd1e79ad952b62b49"
1156+
checksum = "fc344b02d3868feb131e8b5fe2b9b0a1cc42942679af493061fc13b853243872"
11571157
dependencies = [
11581158
"cfg-if",
11591159
"libc",
1160+
"wasi",
11601161
]
11611162

11621163
[[package]]
@@ -1583,9 +1584,9 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
15831584

15841585
[[package]]
15851586
name = "libc"
1586-
version = "0.2.61"
1587+
version = "0.2.62"
15871588
source = "registry+https://github.com/rust-lang/crates.io-index"
1588-
checksum = "c665266eb592905e8503ba3403020f4b8794d26263f412ca33171600eca9a6fa"
1589+
checksum = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
15891590
dependencies = [
15901591
"rustc-std-workspace-core",
15911592
]
@@ -3248,7 +3249,7 @@ version = "0.0.0"
32483249
dependencies = [
32493250
"graphviz",
32503251
"log",
3251-
"rand 0.6.1",
3252+
"rand 0.7.0",
32523253
"rustc",
32533254
"rustc_data_structures",
32543255
"rustc_fs_util",
@@ -3864,7 +3865,7 @@ dependencies = [
38643865
"panic_abort",
38653866
"panic_unwind",
38663867
"profiler_builtins",
3867-
"rand 0.6.1",
3868+
"rand 0.7.0",
38683869
"rustc_asan",
38693870
"rustc_lsan",
38703871
"rustc_msan",
@@ -4686,6 +4687,12 @@ dependencies = [
46864687
"try-lock",
46874688
]
46884689

4690+
[[package]]
4691+
name = "wasi"
4692+
version = "0.5.0"
4693+
source = "registry+https://github.com/rust-lang/crates.io-index"
4694+
checksum = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7"
4695+
46894696
[[package]]
46904697
name = "winapi"
46914698
version = "0.2.8"

src/librustc_incremental/Cargo.toml

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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);

src/tools/tidy/src/deps.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ const WHITELIST: &[Crate<'_>] = &[
172172
Crate("vcpkg"),
173173
Crate("version_check"),
174174
Crate("void"),
175+
Crate("wasi"),
175176
Crate("winapi"),
176177
Crate("winapi-build"),
177178
Crate("winapi-i686-pc-windows-gnu"),

0 commit comments

Comments
 (0)