Rollup merge of rust-lang#98488 - Mark-Simulacrum:bump-rls, r=pietroa…

…lbini Bump RLS to latest master on rust-lang/rls Of primary interest, this merges rust-lang/rls@ece09b8 into rust-lang/rust, which brings in the changes that fix RLS tests broken by rust-lang#97853. rust-lang#97853 already introduced that commit's changes (under rust-lang/rls@27f4044) but without putting those changes on rust-lang/rls as a branch, so we ended up with an orphan commit that caused trouble when updating submodules in rust-lang/rust. This commit, once merged into rust-lang/rust, should continue to let RLS tests to pass on rust-lang/rust's side and move us back into a healthy state where tip of the submodule points to a valid master commit in the rust-lang/rls repository. cc rust-lang#98451, but not marking as fixed as I believe we need to add verification to prevent future oversights.
JohnTitor · Jun 26, 2022 · d0828a3 · d0828a3
2 parents e1862ca + 557793c
commit d0828a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -3054,7 +3054,6 @@ name = "racer"
 version = "2.2.2"
 dependencies = [
  "bitflags",
- "clap 2.34.0",
  "derive_more",
  "env_logger 0.7.1",
  "humantime 2.0.1",
@@ -3278,7 +3277,7 @@ dependencies = [
  "difference",
  "env_logger 0.9.0",
  "futures 0.3.19",
- "heck 0.3.1",
+ "heck 0.4.0",
  "home",
  "itertools",
  "jsonrpc-core",

diff --git a/src/tools/rls b/src/tools/rls
+8 −63		Cargo.lock
+2 −2		Cargo.toml
+0 −1		racer/Cargo.toml
+1 −1		rls-span/src/compiler.rs
+3 −10		rls-vfs/src/lib.rs
+83 −0		rls-vfs/src/test.rs
+2 −2		rls/src/actions/run.rs
+3 −1		rls/src/config.rs
+15 −0		rls/src/server/mod.rs
+1 −1		rust-toolchain
+39 −21		tests/client.rs
+10 −0		tests/fixtures/lens_run/src/main.rs