This repository has been archived by the owner on Dec 29, 2022. It is now read-only.
Adjust for upstream changes #1700
Merged
Conversation
This file contains 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
|
Thank you for taking care of this! If the Lines 189 to 194 in 50d825e |
Mark-Simulacrum
force-pushed
the
fix-76474
branch
from
5fea2f9
to
d4e2bd7
Compare
|
I've confirmed this seems to fix things locally (after the latest force push), or at least RLS builds. |
|
Hm, test failure looks unrelated to this PR at least, do you think it's reliable? I don't really know where to start investigating it. |
|
The tooltip test failures are unrelated. I updated them a few weeks ago to reflect the upstream changes, but they're failing again due to subsequent changes. |
|
Tried to push up a commit fixing tooltip failures -- seems to be passing tests now too. |
|
CI here is now passing. I can handle the submodule update if someone wants to merge this? |
|
Thanks! |
Mark-Simulacrum
added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
Oct 1, 2020
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 1, 2020
Update rls Includes rust-lang/rls#1700, just fixing compilation and test failures. Fixes rust-lang#77311.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
r? @Xanewok -- I think this should fix rust-lang/rust master