Auto merge of #54489 - matthiaskrgr:rls, r=kennytm

update rls to 32d457717ce37babef199fe4984b1e20d4e108d4 I patched rls to use the `rustc_tools_utils` supplied by the clippy submodule to get around the tidy warning. Should fix rls and toolstate.
rust-lang · Sep 24, 2018 · 5ad5aca · 5ad5aca
2 parents 8a92ebf + 500352f
commit 5ad5aca
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/Cargo.lock b/src/Cargo.lock
@@ -1801,6 +1801,7 @@ dependencies = [
  "rls-vfs 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-workspace-hack 1.0.0",
+ "rustc_tools_util 0.1.0",
  "rustfmt-nightly 0.99.4",
  "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",

diff --git a/src/Cargo.toml b/src/Cargo.toml
@@ -64,3 +64,4 @@ rustc-workspace-hack = { path = 'tools/rustc-workspace-hack' }
 
 [patch."https://github.com/rust-lang-nursery/rust-clippy"]
 clippy_lints = { path = "tools/clippy/clippy_lints" }
+rustc_tools_util = { path = "tools/clippy/rustc_tools_util" }
diff --git a/src/tools/rls b/src/tools/rls
Original file line number	Diff line number	Diff line change
Expand Up		@@ -64,3 +64,4 @@ rustc-workspace-hack = { path = 'tools/rustc-workspace-hack' }

		[patch."https://github.com/rust-lang-nursery/rust-clippy"]
		clippy_lints = { path = "tools/clippy/clippy_lints" }
		rustc_tools_util = { path = "tools/clippy/rustc_tools_util" }