Bump RLS to latest master on rust-lang/rls #98488
Merged
+2
−3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@Mark-Simulacrum: no appropriate reviewer found, use r? to override |
|
rust-highfive
added
the
S-waiting-on-review
Mark-Simulacrum
added
beta-nominated
|
beta-nominating and accepting for backport into 1.63, cc @pietroalbini -- we should try to avoid stable releases pointing to the orphaned rust-lang/rls commit. The Cargo fix landed before 1.63 branched via #98395. |
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 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.
Mark-Simulacrum
force-pushed
the
bump-rls
branch
from
55b3df0 to
557793c
Compare
This was referenced Jun 25, 2022
|
btw, is there any plan to deprecate rust-lang/rls as rust-lang/rust-analyzer is a de facto new rls? |
|
This isn't the place to discuss that, but the short answer is yes. See https://blog.rust-lang.org/2022/02/21/rust-analyzer-joins-rust-org.html. |
|
@bors r+ |
|
📌 Commit 557793c has been approved by |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jun 25, 2022
…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.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jun 25, 2022
…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.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 26, 2022
Rollup of 8 pull requests Successful merges: - rust-lang#98371 (Fix printing `impl trait` under binders) - rust-lang#98385 (Work around llvm 12's memory ordering restrictions.) - rust-lang#98474 (x.py: Support systems with only `python3` not `python`) - rust-lang#98488 (Bump RLS to latest master on rust-lang/rls) - rust-lang#98491 (Fix backtrace UI test when panic=abort is used) - rust-lang#98502 (Fix source sidebar hover in ayu theme) - rust-lang#98509 (diagnostics: consider parameter count when suggesting smart pointers) - rust-lang#98513 (Fix LLVM rebuild with download-ci-llvm.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 28, 2022
…imulacrum [beta] Prepare beta 1.63.0 This PR switches the channel of `beta` after the force-push, and backports the following PRs: * rust-lang#98488 * rust-lang#98412 r? `@ghost`
|
Untagging, re-milestoning, this was included in #98572. |
ehuss
removed
the
beta-nominated
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.