[NFC] Formatting cleanup to help with next conflicts #39770
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
|
I've been going through the main -> next merge conflicts and there were some where the formatting made a little more sense in next, so that's these. I'm not too sure about the SmallVector changes, happy to leave them out if anyone thinks the I could also fix all the conflicts as is and just pick all the |
etcwilde
approved these changes
Oct 15, 2021
|
@swift-ci please test |
|
The Windows failure is just that the bot is out of space. I'm going to go ahead and merge this so that I can continue cleaning up the remaining merge conflicts. Thanks! |
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.
No description provided.