diff options
| author | bors <bors@rust-lang.org> | 2019-09-10 00:34:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-10 00:34:30 +0000 |
| commit | 122fefc63e4c2bab7f76bb24a7ab056b7bc7b37e (patch) | |
| tree | 62514217c15a544da797ecfea60d64cfd0a13307 /src/libstd | |
| parent | 0b36e9dea3f2ff25b1d0df2669836c33cce89ae5 (diff) | |
| parent | 342722e584ce08b97509de73bb76d6ccc6c68423 (diff) | |
| download | rust-122fefc63e4c2bab7f76bb24a7ab056b7bc7b37e.tar.gz rust-122fefc63e4c2bab7f76bb24a7ab056b7bc7b37e.zip | |
Auto merge of #64321 - Centril:rollup-jsj5tpl, r=Centril
Rollup of 5 pull requests Successful merges: - #63806 (Upgrade rand to 0.7) - #64054 (Always emit unresolved import errors and hide unused import lint) - #64279 (Bump RLS and Rustfmt submodules to use rustc-ap-* v583) - #64317 (Update LLVM submodule) - #64320 (Update version of `rustc-std-workspace-*` crates) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/libstd/fs.rs | 2 | ||||
| -rw-r--r-- | src/libstd/tests/env.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index b5cbec7b0fa..20442abc588 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -38,7 +38,7 @@ features = [ optional = true [dev-dependencies] -rand = "0.6.1" +rand = "0.7" [target.x86_64-apple-darwin.dependencies] rustc_asan = { path = "../librustc_asan" } diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index 5f76875bd66..b14e02a2cb4 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -2144,7 +2144,7 @@ mod tests { use crate::sys_common::io::test::{TempDir, tmpdir}; use crate::thread; - use rand::{rngs::StdRng, FromEntropy, RngCore}; + use rand::{rngs::StdRng, RngCore, SeedableRng}; #[cfg(windows)] use crate::os::windows::fs::{symlink_dir, symlink_file}; diff --git a/src/libstd/tests/env.rs b/src/libstd/tests/env.rs index 06fb5533afd..f8014cb2ad9 100644 --- a/src/libstd/tests/env.rs +++ b/src/libstd/tests/env.rs @@ -5,7 +5,7 @@ use rand::{thread_rng, Rng}; use rand::distributions::Alphanumeric; fn make_rand_name() -> OsString { - let mut rng = thread_rng(); + let rng = thread_rng(); let n = format!("TEST{}", rng.sample_iter(&Alphanumeric).take(10) .collect::<String>()); let n = OsString::from(n); |