Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove uses of Option<MarkerTree> in ResolutionGraph #6035

Merged
merged 1 commit into from
Aug 12, 2024

Conversation

ibraheemdev
Copy link
Member

Summary

Missed this one in #5978.

Resolves #5902.

@ibraheemdev ibraheemdev added lock Related to universal resolution and locking preview Experimental behavior labels Aug 12, 2024
if let Some(edge) = next
.find_edge(source, target)
.and_then(|edge| next.edge_weight_mut(edge))
{
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
57 checks passed
@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