Remove uses of Option<MarkerTree>
#5978
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
ibraheemdev
commented
Aug 9, 2024
| @@ -3120,8 +3117,5 @@ fn satisfies_requires_python( | |||
| /// Returns true if and only if the given requirement's marker expression has a | |||
| /// possible true value given the `markers` expression given. | |||
| fn possible_to_satisfy_markers(markers: &MarkerTree, requirement: &Requirement) -> bool { | |||
There was a problem hiding this comment.
Unrelated to this changed, but also noticed that the invariant here is reversed. This should be fixed as part of #5562.
ibraheemdev
force-pushed
the
ibraheem/marker-smart-constructors
branch
3 times, most recently
from
ccc14f8
to
7b5e4ec
Compare
ibraheemdev
force-pushed
the
ibraheem/marker-smart-constructors
branch
from
7b5e4ec
to
26a8062
Compare
| @@ -146,8 +140,8 @@ impl Lock { | |||
| else { | |||
| continue; | |||
| }; | |||
| let marker = edge.weight().as_ref(); | |||
| locked_dist.add_dependency(dependency_dist, marker); | |||
| let marker = edge.weight().clone(); | |||
There was a problem hiding this comment.
Do we need to clone here in order to support unwrapping to default?
There was a problem hiding this comment.
We used to clone inside add_dependency anyways. Also a MarkerTree is just a usize now, it could even implement Copy.
There was a problem hiding this comment.
👍 Yeah sorry saw that afterwards, they're all interned now, right?
charliermarsh
approved these changes
Aug 10, 2024
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
Follow up to #5898. This should fix some of the failures in #5887 where
uv lock --lockedis failing due toSome(true)andNonemarkers not comparing equal.