Skip to content

Commit 16c4011

Browse files
committed
Auto merge of #64381 - mati865:rand, r=alexcrichton
Upgrade parking_lot and tempfile rustc dependencies This should be last piece to unbreak `rustc` in #63848
2 parents b6269f2 + 935394f commit 16c4011

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

Cargo.lock

+6-6
Original file line numberDiff line numberDiff line change
@@ -3017,7 +3017,7 @@ dependencies = [
30173017
"log",
30183018
"measureme",
30193019
"num_cpus",
3020-
"parking_lot 0.7.1",
3020+
"parking_lot 0.9.0",
30213021
"polonius-engine",
30223022
"rustc-rayon",
30233023
"rustc-rayon-core",
@@ -3311,7 +3311,7 @@ dependencies = [
33113311
"log",
33123312
"memmap",
33133313
"num_cpus",
3314-
"parking_lot 0.7.1",
3314+
"parking_lot 0.9.0",
33153315
"rustc",
33163316
"rustc_apfloat",
33173317
"rustc_codegen_utils",
@@ -3354,7 +3354,7 @@ dependencies = [
33543354
"jobserver",
33553355
"lazy_static 1.3.0",
33563356
"log",
3357-
"parking_lot 0.7.1",
3357+
"parking_lot 0.9.0",
33583358
"rustc-hash",
33593359
"rustc-rayon",
33603360
"rustc-rayon-core",
@@ -4261,13 +4261,13 @@ dependencies = [
42614261

42624262
[[package]]
42634263
name = "tempfile"
4264-
version = "3.0.5"
4264+
version = "3.1.0"
42654265
source = "registry+https://github.com/rust-lang/crates.io-index"
4266-
checksum = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2"
4266+
checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
42674267
dependencies = [
42684268
"cfg-if",
42694269
"libc",
4270-
"rand 0.6.1",
4270+
"rand 0.7.0",
42714271
"redox_syscall",
42724272
"remove_dir_all",
42734273
"winapi 0.3.6",

src/librustc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ rustc_serialize = { path = "../libserialize", package = "serialize" }
3030
syntax = { path = "../libsyntax" }
3131
syntax_pos = { path = "../libsyntax_pos" }
3232
backtrace = "0.3.3"
33-
parking_lot = "0.7"
33+
parking_lot = "0.9"
3434
byteorder = { version = "1.1", features = ["i128"]}
3535
chalk-engine = { version = "0.9.0", default-features=false }
3636
rustc_fs_util = { path = "../librustc_fs_util" }

src/librustc_codegen_ssa/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ memmap = "0.6"
1717
log = "0.4.5"
1818
libc = "0.2.44"
1919
jobserver = "0.1.11"
20-
parking_lot = "0.7"
21-
tempfile = "3.0.5"
20+
parking_lot = "0.9"
21+
tempfile = "3.1"
2222

2323
rustc_serialize = { path = "../libserialize", package = "serialize" }
2424
syntax = { path = "../libsyntax" }

src/librustc_data_structures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ rustc-hash = "1.0.1"
2626
smallvec = { version = "0.6.7", features = ["union", "may_dangle"] }
2727

2828
[dependencies.parking_lot]
29-
version = "0.7"
29+
version = "0.9"
3030
features = ["nightly"]

0 commit comments

Comments
 (0)