1.52.0 #8718
Merged
1.52.0 #8718
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
Member
|
bors try |
Contributor
tryMerge conflict. |
Contributor
|
I've resolved the handlers.rs conflict by accepting my changes from https://github.com/rust-analyzer/rust-analyzer/pull/8711/files#diff-13acc206c18467a7dbe2876d204fee460c728232fbb677a4d769641e76dd9fe5 and discarding the 1.52 ones, since the parsing function had been changed entirely. Yet I've done it via the GitHub UI and that apparently introduced the merge commit instead of the rebase: if that's unwanted, we need a proper rebase. |
Member
|
Merge commits will be rejected by CI, so ye we want a proper rebase here instead |
Contributor
|
Well, I'll take it over since started to mess with it, hope it's fine. |
Contributor
|
bors try |
Contributor
Author
Thanks! |
Contributor
Contributor
|
bors r+ |
Contributor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
A lot of APIs we use in this release!