Update Cargo, build curl/OpenSSL statically via features

In addition to to updating Cargo's submodule and Cargo's dependencies,
this also updates Cargo's build to build OpenSSL statically into Cargo
as well as libcurl unconditionally. This removes OpenSSL build logic
from the bootstrap code, and otherwise requests that even on OSX we
build curl statically.

4 files changed, 16 insertions, 11 deletions

diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject 09ce4b519535c77d17b818b6dc0b72c6668642c
+Subproject 2d0863f657e6f45159fc7412267eee3e659185e
diff --git a/src/tools/rls b/src/tools/rls
-Subproject 440a9855b73b6bf9b5345cf3a79565566f6ef34
+Subproject 1c755efed6ee265c762f4d3fec73de8a989637a
diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml
index 77ffe41d7f6..ee14c62df30 100644
--- a/src/tools/rustc-workspace-hack/Cargo.toml
+++ b/src/tools/rustc-workspace-hack/Cargo.toml
@@ -39,6 +39,7 @@ features = [
   "schannel",
   "securitybaseapi",
   "shellapi",
+  "sspi",
   "synchapi",
   "sysinfoapi",
   "timezoneapi",
@@ -48,10 +49,14 @@ features = [
   "wincrypt",
 ]
 
-[dependencies.serde_json]
-version = "1.0.31"
-features = ["raw_value"]
+[dependencies]
+serde_json = { version = "1.0.31", features = ["raw_value"] }
+rand = { version = "0.5.5", features = ["i128_support"] }
+curl-sys = { version = "0.4.13", optional = true }
 
-[dependencies.rand]
-version = "0.5.5"
-features = ["i128_support"]
+[target.'cfg(not(windows))'.dependencies]
+openssl = { version = "0.10.12", optional = true }
+
+
+[features]
+all-static = ['openssl/vendored', 'curl-sys/static-curl']
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
-Subproject 90692a5917ac595a9d6b68b88c5f1ad4485670f
+Subproject 750b25261380b776de2518fd6863fe63f98d272