merge commits from rustfmt-2.0 branch #3907
Merged
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
|
Ah looks like this needs a bump based on the rustc-ap* 606 changes |
calebcartwright
commented
Nov 7, 2019
| } | ||
| 5 => 5, | ||
| 6 => { // comment 6 | ||
| } |
There was a problem hiding this comment.
I did have to update this one line to get the tests to pass as the comment is now being kept on the same line as the opening bracket. IIRC that's because been some subequent updates that maintain that same line association. I added another arm below that I believe covers that original use case
|
Awesome, thank you! |
|
backport not needed |
karyon
added
1x-backport:completed
1x-backport:n/a
and removed
1x-backport:completed
labels
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.
Thought it might be helpful to go ahead and merge these commits to minimize the chance of potential conflicts, but can close this if it'd be better to wait
Follow up of #3906