diff options
| author | bors <bors@rust-lang.org> | 2018-09-24 04:32:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-24 04:32:24 +0000 |
| commit | 5ad5aca714a29931903b8e22851dfd9db2bedba7 (patch) | |
| tree | be6454ef35e4c565d4a71f0159620d48d87d991f /src | |
| parent | 8a92ebfb59263bc678dcae5de5568776cb172c6e (diff) | |
| parent | 500352f5bcb61eaf830c4800907dd8bb78d5bd3e (diff) | |
| download | rust-5ad5aca714a29931903b8e22851dfd9db2bedba7.tar.gz rust-5ad5aca714a29931903b8e22851dfd9db2bedba7.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Cargo.lock | 1 | ||||
| -rw-r--r-- | src/Cargo.toml | 1 | ||||
| m--------- | src/tools/rls | 0 |
3 files changed, 2 insertions, 0 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock index c2c3f37db37..9273251588f 100644 --- 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 index 01663487f92..e8c44ea57c2 100644 --- 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 -Subproject 2b21611d38a16a775f55ea102d8f442dfc51cf6 +Subproject 32d457717ce37babef199fe4984b1e20d4e108d |