Skip to content

Commit

Permalink
Auto merge of rust-lang#64381 - mati865:rand, r=alexcrichton
Browse files Browse the repository at this point in the history
Upgrade parking_lot and tempfile rustc dependencies

This should be last piece to unbreak `rustc` in rust-lang#63848
  • Loading branch information
bors committed Sep 16, 2019
2 parents b6269f2 + 935394f commit 16c4011
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3017,7 +3017,7 @@ dependencies = [
"log",
"measureme",
"num_cpus",
"parking_lot 0.7.1",
"parking_lot 0.9.0",
"polonius-engine",
"rustc-rayon",
"rustc-rayon-core",
Expand Down Expand Up @@ -3311,7 +3311,7 @@ dependencies = [
"log",
"memmap",
"num_cpus",
"parking_lot 0.7.1",
"parking_lot 0.9.0",
"rustc",
"rustc_apfloat",
"rustc_codegen_utils",
Expand Down Expand Up @@ -3354,7 +3354,7 @@ dependencies = [
"jobserver",
"lazy_static 1.3.0",
"log",
"parking_lot 0.7.1",
"parking_lot 0.9.0",
"rustc-hash",
"rustc-rayon",
"rustc-rayon-core",
Expand Down Expand Up @@ -4261,13 +4261,13 @@ dependencies = [

[[package]]
name = "tempfile"
version = "3.0.5"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2"
checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
dependencies = [
"cfg-if",
"libc",
"rand 0.6.1",
"rand 0.7.0",
"redox_syscall",
"remove_dir_all",
"winapi 0.3.6",
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ rustc_serialize = { path = "../libserialize", package = "serialize" }
syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
backtrace = "0.3.3"
parking_lot = "0.7"
parking_lot = "0.9"
byteorder = { version = "1.1", features = ["i128"]}
chalk-engine = { version = "0.9.0", default-features=false }
rustc_fs_util = { path = "../librustc_fs_util" }
Expand Down
4 changes: 2 additions & 2 deletions src/librustc_codegen_ssa/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ memmap = "0.6"
log = "0.4.5"
libc = "0.2.44"
jobserver = "0.1.11"
parking_lot = "0.7"
tempfile = "3.0.5"
parking_lot = "0.9"
tempfile = "3.1"

rustc_serialize = { path = "../libserialize", package = "serialize" }
syntax = { path = "../libsyntax" }
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_data_structures/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ rustc-hash = "1.0.1"
smallvec = { version = "0.6.7", features = ["union", "may_dangle"] }

[dependencies.parking_lot]
version = "0.7"
version = "0.9"
features = ["nightly"]

0 comments on commit 16c4011

Please sign in to comment.