about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Scherer <github35764891676564198441@oli-obk.de>2019-01-01 14:36:05 +0100
committerOliver Scherer <github35764891676564198441@oli-obk.de>2019-01-08 15:21:06 +0100
commitedaa1882bb621973d1d9b8972b3a32fc8eeb5a97 (patch)
tree85dcff8cb05532613464fb6099c4af72c9b1d22d
parentf8033a29236978942d1f83fa260de43bb05ab47a (diff)
downloadrust-edaa1882bb621973d1d9b8972b3a32fc8eeb5a97.tar.gz
rust-edaa1882bb621973d1d9b8972b3a32fc8eeb5a97.zip
Adjust cargo workspace hack to miri/cargo interactions
-rw-r--r--Cargo.lock2
-rw-r--r--src/tools/rustc-workspace-hack/Cargo.toml5
2 files changed, 6 insertions, 1 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 1ea872cc342..1fde5ac8cb1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2260,8 +2260,10 @@ dependencies = [
 name = "rustc-workspace-hack"
 version = "1.0.0"
 dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml
index ca440167f9f..d28ef4a9ee9 100644
--- a/src/tools/rustc-workspace-hack/Cargo.toml
+++ b/src/tools/rustc-workspace-hack/Cargo.toml
@@ -50,12 +50,15 @@ features = [
 ]
 
 [dependencies]
-curl-sys = { version = "0.4.13", optional = true }
+curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true }
 parking_lot = { version = "0.6", 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"] }
 smallvec = { version = "0.6", features = ['union'] }
+scopeguard = { version = "0.3.3", features = ["use_std", "default"]}
+byteorder = { version = "1.2.7", features = ["i128"]}
+
 
 [target.'cfg(not(windows))'.dependencies]
 openssl = { version = "0.10.12", optional = true }