diff options
| author | bors <bors@rust-lang.org> | 2019-02-23 19:46:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-23 19:46:10 +0000 |
| commit | aadbc459bd97a0325897e2ff94999efbec6a499c (patch) | |
| tree | 9ed05a9c57ba92c3e6bf9f0962050520a425bccf /src | |
| parent | 02a4e272549498af2b91dcaf8e8df035cab36839 (diff) | |
| parent | a82f0ce54befa3808278384e4deab43e7d683e71 (diff) | |
| download | rust-aadbc459bd97a0325897e2ff94999efbec6a499c.tar.gz rust-aadbc459bd97a0325897e2ff94999efbec6a499c.zip | |
Auto merge of #57051 - Eijebong:parking_lot, r=nikomatsakis
Update parking_lot to 0.7 Unfortunately this'll dupe parking_lot until the data_structures crate is published and be updated in rls in conjunction with crossbeam-channel
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/librustc_data_structures/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/librustdoc/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/tools/rustc-workspace-hack/Cargo.toml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc/Cargo.toml b/src/librustc/Cargo.toml index cb9eb32f8d2..e83adad4e2a 100644 --- a/src/librustc/Cargo.toml +++ b/src/librustc/Cargo.toml @@ -30,7 +30,7 @@ serialize = { path = "../libserialize" } syntax = { path = "../libsyntax" } syntax_pos = { path = "../libsyntax_pos" } backtrace = "0.3.3" -parking_lot = "0.6" +parking_lot = "0.7" byteorder = { version = "1.1", features = ["i128"]} chalk-engine = { version = "0.9.0", default-features=false } rustc_fs_util = { path = "../librustc_fs_util" } diff --git a/src/librustc_data_structures/Cargo.toml b/src/librustc_data_structures/Cargo.toml index f781952d417..6aa262715ec 100644 --- a/src/librustc_data_structures/Cargo.toml +++ b/src/librustc_data_structures/Cargo.toml @@ -23,5 +23,5 @@ rustc-hash = "1.0.1" smallvec = { version = "0.6.7", features = ["union", "may_dangle"] } [dependencies.parking_lot] -version = "0.6" +version = "0.7" features = ["nightly"] diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml index bdd18e88840..a8c9166591d 100644 --- a/src/librustdoc/Cargo.toml +++ b/src/librustdoc/Cargo.toml @@ -12,4 +12,4 @@ path = "lib.rs" pulldown-cmark = { version = "0.1.2", default-features = false } minifier = "0.0.28" tempfile = "3" -parking_lot = "0.6.4" +parking_lot = "0.7" diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index 157b7311707..1aba52bafbb 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -56,7 +56,7 @@ features = [ [dependencies] curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true } -parking_lot = { version = "0.6", features = ['nightly'] } +parking_lot = { version = "0.7", features = ['nightly'] } rand = { version = "0.5.5", features = ["i128_support"] } serde = { version = "1.0.82", features = ['derive'] } serde_json = { version = "1.0.31", features = ["raw_value"] } |