Skip to content

Comments

Remove uses of Option<MarkerTree> in ResolutionGraph#6035

Merged
ibraheemdev merged 1 commit intomainfrom
ibraheem/option-marker-fix
Aug 12, 2024
Merged

Remove uses of Option<MarkerTree> in ResolutionGraph#6035
ibraheemdev merged 1 commit intomainfrom
ibraheem/option-marker-fix

Conversation

@ibraheemdev
Copy link
Member

Summary

Missed this one in #5978.

Resolves #5902.

@ibraheemdev ibraheemdev force-pushed the ibraheem/option-marker-fix branch from 6b7d429 to 7ef3fb6 Compare August 12, 2024 13:58
@ibraheemdev ibraheemdev added lock Related to universal resolution and locking preview Experimental behavior labels Aug 12, 2024
{
if let (Some(marker), Some(ref version_marker)) = (edge.as_mut(), weight) {
marker.and(version_marker.clone());
if edge.is_true() || weight.is_true() {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels a little odd..

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could also just OR them and simplify? But this seems simpler.

@ibraheemdev ibraheemdev merged commit fb5c3bb into main Aug 12, 2024
@ibraheemdev ibraheemdev deleted the ibraheem/option-marker-fix branch August 12, 2024 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lock Related to universal resolution and locking preview Experimental behavior

Projects

None yet

Development

Successfully merging this pull request may close these issues.

uv lock --locked false positive

2 participants