From 0120e178555d3fa59f625a51d47eb7788e184e7f Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Mon, 3 Sep 2018 16:25:26 -0700
Subject: [PATCH] Update Cargo and RLS

---
 src/Cargo.lock        | 8 ++++----
 src/bootstrap/test.rs | 2 ++
 src/tools/cargo       | 2 +-
 src/tools/rls         | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Cargo.lock b/src/Cargo.lock
index fc2dfcfd8604c..72e60c65335d9 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -172,13 +172,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "cargo"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crates-io 0.18.0",
+ "crates-io 0.19.0",
  "crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "curl 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -452,7 +452,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "crates-io"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
  "curl 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1753,7 +1753,7 @@ dependencies = [
 name = "rls"
 version = "0.130.5"
 dependencies = [
- "cargo 0.30.0",
+ "cargo 0.31.0",
  "cargo_metadata 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clippy_lints 0.0.212",
  "crossbeam-channel 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index f762d9414cff3..8e42c9c1ec773 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -237,6 +237,8 @@ impl Step for Cargo {
         // Don't run cross-compile tests, we may not have cross-compiled libstd libs
         // available.
         cargo.env("CFG_DISABLE_CROSS_TESTS", "1");
+        // Disable a test that has issues with mingw.
+        cargo.env("CARGO_TEST_DISABLE_GIT_CLI", "1");
 
         try_run(
             builder,
diff --git a/src/tools/cargo b/src/tools/cargo
index 0ec7281b9c36c..2fb77a49b43bf 160000
--- a/src/tools/cargo
+++ b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 0ec7281b9c36ca7f724bfac8b029633910270a48
+Subproject commit 2fb77a49b43bf7266793c07a19a06749e6a8ad5a
diff --git a/src/tools/rls b/src/tools/rls
index cf6358a00540a..ac2e802ae9115 160000
--- a/src/tools/rls
+++ b/src/tools/rls
@@ -1 +1 @@
-Subproject commit cf6358a00540a83dcc6e8c243f3306ccdbb9c354
+Subproject commit ac2e802ae9115786196a498e22086d403efd95a4