diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2022-06-26 13:14:59 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-26 13:14:59 +0900 |
| commit | d0828a3915b7245fe8cbe6a038853bff3501613d (patch) | |
| tree | 08ed4651d7f8fd6cb8d31f76f4ed3a51399c5625 | |
| parent | e1862ca51ca7ec1a489728989a793436e394eb27 (diff) | |
| parent | 557793c2a4c5b4713d51c5c55e4f54c285bdc084 (diff) | |
| download | rust-d0828a3915b7245fe8cbe6a038853bff3501613d.tar.gz rust-d0828a3915b7245fe8cbe6a038853bff3501613d.zip | |
Rollup merge of #98488 - Mark-Simulacrum:bump-rls, r=pietroalbini
Bump RLS to latest master on rust-lang/rls Of primary interest, this merges rust-lang/rls@ece09b88c0365947af79c0ffdeea02bc6c1eec25 into rust-lang/rust, which brings in the changes that fix RLS tests broken by #97853. #97853 already introduced that commit's changes (under rust-lang/rls@27f4044df03d15c7c38a483c3e4635cf4f51807d) 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 https://github.com/rust-lang/rust/issues/98451, but not marking as fixed as I believe we need to add verification to prevent future oversights.
| -rw-r--r-- | Cargo.lock | 3 | ||||
| m--------- | src/tools/rls | 0 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock index a094cd78429..633eeb3d3bd 100644 --- 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 -Subproject 27f4044df03d15c7c38a483c3e4635cf4f51807 +Subproject ece09b88c0365947af79c0ffdeea02bc6c1eec2 |