Auto merge of #50433 - nrc:update, r=alexcrichton

Update RLS and Rustfmt (and Cargo)

Updates RLS and Rustfmt (the latter fixing tests). Cargo is updated too (to fix RLS tests), but that is covered by https://github.com/rust-lang/rust/pull/50417, so probably  won't do much.

r? @alexcrichton

diff --git a/src/Cargo.lock b/src/Cargo.lock
index f482bed317641b13bc5b420610ce068ba613bcbe..ccdb24d737551f0c3a35b086c05ae1b2cf995a12 100644 (file)
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -996,9 +996,10 @@ dependencies = [
 
 [[package]]
 name = "languageserver-types"
-version = "0.36.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1632,7 +1633,7 @@ dependencies = [
  "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 8.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "languageserver-types 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "languageserver-types 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3065,7 +3066,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9ad0485404155f45cce53a40d4b2d6ac356418300daed05273d9e26f91c390be"
 "checksum jsonrpc-core 8.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ddf83704f4e79979a424d1082dd2c1e52683058056c9280efa19ac5f6bc9033c"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-"checksum languageserver-types 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)" = "174cdfb8bed13225bb419bec66ee1c970099c875688645f9c4a82e3af43ba69d"
+"checksum languageserver-types 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad4cdd5e52d71aca47050e5b25f03082609c63a1e76b7362ebdd010895b3f854"
 "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
 "checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
 "checksum lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6f08839bc70ef4a3fe1d566d5350f519c5912ea86be0df1740a7d247c7fc0ef"

diff --git a/src/tools/cargo b/src/tools/cargo
index 66b0ffa81c560be1b79511b51f49cbb23bc78651..af3f1cd29bc872b932a13083e531255aab233a7e 160000 (submodule)
--- a/src/tools/cargo
+++ b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 66b0ffa81c560be1b79511b51f49cbb23bc78651
+Subproject commit af3f1cd29bc872b932a13083e531255aab233a7e

diff --git a/src/tools/rls b/src/tools/rls
index 99796f6a6592b4d897719a1736ec580c96f5441a..d2f44357fef6d61f316abc403e0a5d917f2771c6 160000 (submodule)
--- a/src/tools/rls
+++ b/src/tools/rls
@@ -1 +1 @@
-Subproject commit 99796f6a6592b4d897719a1736ec580c96f5441a
+Subproject commit d2f44357fef6d61f316abc403e0a5d917f2771c6

diff --git a/src/tools/rustfmt b/src/tools/rustfmt
index d8982e5efe8fda1d6f64e88a67da2f05b6af225e..b6cd17f28ae314f2484ff05d3ce57652d51c5e85 160000 (submodule)
--- a/src/tools/rustfmt
+++ b/src/tools/rustfmt
@@ -1 +1 @@
-Subproject commit d8982e5efe8fda1d6f64e88a67da2f05b6af225e
+Subproject commit b6cd17f28ae314f2484ff05d3ce57652d51c5e85