about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-02-23 19:46:10 +0000
committerbors <bors@rust-lang.org>2019-02-23 19:46:10 +0000
commitaadbc459bd97a0325897e2ff94999efbec6a499c (patch)
tree9ed05a9c57ba92c3e6bf9f0962050520a425bccf /src/tools
parent02a4e272549498af2b91dcaf8e8df035cab36839 (diff)
parenta82f0ce54befa3808278384e4deab43e7d683e71 (diff)
downloadrust-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/tools')
-rw-r--r--src/tools/rustc-workspace-hack/Cargo.toml2
1 files changed, 1 insertions, 1 deletions
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"] }