Commit d0828a3
authored
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@ece09b8 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@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 #98451, but not marking as fixed as I believe we need to add verification to prevent future oversights.2 files changed
+2
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3054 | 3054 | | |
3055 | 3055 | | |
3056 | 3056 | | |
3057 | | - | |
3058 | 3057 | | |
3059 | 3058 | | |
3060 | 3059 | | |
| |||
3278 | 3277 | | |
3279 | 3278 | | |
3280 | 3279 | | |
3281 | | - | |
| 3280 | + | |
3282 | 3281 | | |
3283 | 3282 | | |
3284 | 3283 | | |
| |||
0 commit comments