Skip to content

Rollup of 5 pull requests #64321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 10, 2019
Merged

Rollup of 5 pull requests #64321

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
32101ad
Upgrade rand to 0.7
mati865 Aug 22, 2019
9a56187
Always emit unresolved import errors and hide unused import lint
estebank Sep 1, 2019
91dae2e
Bump RLS and Rustfmt submodules
Xanewok Sep 8, 2019
c2249a4
cargo update -p rustfmt-nightly
Xanewok Sep 8, 2019
69d5030
Update LLVM submodule
nikic Sep 9, 2019
6c74bc9
Update version of `rustc-std-workspace-*` crates
alexcrichton Sep 9, 2019
611458b
Rollup merge of #63806 - mati865:rand, r=alexcrichton
Centril Sep 9, 2019
8926301
Rollup merge of #64054 - estebank:unused-import-is-to-eager, r=petroc…
Centril Sep 9, 2019
f353d49
Rollup merge of #64279 - Xanewok:bump-rustc-ap, r=tmandry
Centril Sep 9, 2019
7b0d134
Rollup merge of #64317 - nikic:bump-llvm-3, r=alexcrichton
Centril Sep 9, 2019
342722e
Rollup merge of #64320 - alexcrichton:update-patch, r=RalfJung
Centril Sep 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Upgrade rand to 0.7
  • Loading branch information
@mati865
mati865 committed Sep 6, 2019
commit 32101ad3b38d29291a5150840e88aeef2fb911a1
13 changes: 7 additions & 6 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,12 +1151,13 @@ dependencies = [

[[package]]
name = "getrandom"
version = "0.1.8"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34f33de6f0ae7c9cb5e574502a562e2b512799e32abb801cd1e79ad952b62b49"
checksum = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
dependencies = [
"cfg-if",
"libc",
"wasi",
]

[[package]]
Expand Down Expand Up @@ -1583,9 +1584,9 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"

[[package]]
name = "libc"
version = "0.2.61"
version = "0.2.62"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c665266eb592905e8503ba3403020f4b8794d26263f412ca33171600eca9a6fa"
checksum = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
dependencies = [
"rustc-std-workspace-core",
]
Expand Down Expand Up @@ -3248,7 +3249,7 @@ version = "0.0.0"
dependencies = [
"graphviz",
"log",
"rand 0.6.1",
"rand 0.7.0",
"rustc",
"rustc_data_structures",
"rustc_fs_util",
Expand Down Expand Up @@ -3864,7 +3865,7 @@ dependencies = [
"panic_abort",
"panic_unwind",
"profiler_builtins",
"rand 0.6.1",
"rand 0.7.0",
"rustc_asan",
"rustc_lsan",
"rustc_msan",
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_incremental/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ doctest = false
[dependencies]
graphviz = { path = "../libgraphviz" }
log = "0.4"
rand = "0.6"
rand = "0.7"
rustc = { path = "../librustc" }
rustc_data_structures = { path = "../librustc_data_structures" }
rustc_serialize = { path = "../libserialize", package = "serialize" }
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/fs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/tests/env.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down