diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2022-06-25 09:56:56 -0400 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2022-06-25 10:05:31 -0400 |
| commit | 557793c2a4c5b4713d51c5c55e4f54c285bdc084 (patch) | |
| tree | 5cdf878cafc4a2cccdcf1def50273fa0337c1962 | |
| parent | 1aabd8a4a6e1871f14e804302bd60dfcbffd5761 (diff) | |
| download | rust-557793c2a4c5b4713d51c5c55e4f54c285bdc084.tar.gz rust-557793c2a4c5b4713d51c5c55e4f54c285bdc084.zip | |
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 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.
| -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 1108c1f4d4c..b6f17ad7838 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3101,7 +3101,6 @@ name = "racer" version = "2.2.2" dependencies = [ "bitflags", - "clap 2.34.0", "derive_more", "env_logger 0.7.1", "humantime 2.0.1", @@ -3325,7 +3324,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 |