From edaa1882bb621973d1d9b8972b3a32fc8eeb5a97 Mon Sep 17 00:00:00 2001
From: Oliver Scherer <github35764891676564198441@oli-obk.de>
Date: Tue, 1 Jan 2019 14:36:05 +0100
Subject: [PATCH] Adjust cargo workspace hack to miri/cargo interactions
---
Cargo.lock | 2 ++
src/tools/rustc-workspace-hack/Cargo.toml | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
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 }