merge: micro-optimize Merge, clean up constructors
#2538
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
martinvonz
approved these changes
Nov 7, 2023
It's super common that a Merge object holds a resolved value, so let's inline up to 1 element. T of Merge<T> usually consists of a couple of pointer-sized fields. I don't see any measurable speed up, but it's no worse than the original.
Also migrated some callers of 3-way merge, where [left, base, right] order looks okay.
We no longer need to iterate removes and adds separately.
This is basically the same change as the previous commit.
Since (removes, adds) pair is no longer the canonical representation of Merge, the name Merge::new() seems too generic. Let's give more verbose name.
yuja
force-pushed
the
push-nnwtrrustpwr
branch
from
a19b3a0 to
634e409
Compare
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.
Checklist
If applicable:
CHANGELOG.md