Avoid AND-ing multi-term specifiers in marker normalization #4911
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
charliermarsh
force-pushed
the
charlie/term
branch
from
1423796 to
af29c12
Compare
charliermarsh
commented
Jul 9, 2024
| // expression. | ||
| let mut iter = range.iter().flat_map(VersionSpecifier::from_bounds); | ||
| let first = iter.next().unwrap(); | ||
| if let Some(second) = iter.next() { |
There was a problem hiding this comment.
Painful attempt to avoid allocating a vector in the common case (a single term).
BurntSushi
approved these changes
Jul 9, 2024
charliermarsh
force-pushed
the
charlie/term
branch
from
af29c12 to
59ed770
Compare
charliermarsh
force-pushed
the
charlie/term
branch
from
59ed770 to
3d4d45f
Compare
ibraheemdev
reviewed
Jul 9, 2024
| // Look one level deeper for expressions to simplify, as | ||
| // `normalize_all` can return `MarkerTree::Or` for some expressions. | ||
| MarkerTree::Expression(ref expr) => { | ||
| if let Some((key, range)) = keyed_range(expr) { |
There was a problem hiding this comment.
Is one level deeper enough? Or do we have to recurse?
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.
Summary
Given
python_version != '3.8' and python_version < '3.10', the first term was expanded topython_version < '3.8'andpython_version > '3.8'. We then AND'd all three terms together. We don't seem to have a way to differentiate between the terms to AND and the terms to OR in the normalization code (it all gets flattened together), so instead this PR expands the expressions at the leaf level and then flattens them at the level above when appropriate.Closes #4910.