Skip to content

simplify SourceID Ord/Eq #14980

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jan 7, 2025
Merged

simplify SourceID Ord/Eq #14980

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a9527b
assert that this comparison is unneeded
Eh2406 Dec 24, 2024
a84336e
remove the assert for cleaner code
Eh2406 Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions src/cargo/core/source_id.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,21 +591,10 @@ impl Ord for SourceId {
return Ordering::Equal;
}

// Sort first based on `kind`, deferring to the URL comparison below if
// Sort first based on `kind`, deferring to the URL comparison if
// the kinds are equal.
match self.inner.kind.cmp(&other.inner.kind) {
Ordering::Equal => {}
other => return other,
}

// If the `kind` and the `url` are equal, then for git sources we also
// ensure that the canonical urls are equal.
match (&self.inner.kind, &other.inner.kind) {
(SourceKind::Git(_), SourceKind::Git(_)) => {
self.inner.canonical_url.cmp(&other.inner.canonical_url)
}
_ => self.inner.url.cmp(&other.inner.url),
}
let ord_kind = self.inner.kind.cmp(&other.inner.kind);
ord_kind.then_with(|| self.inner.canonical_url.cmp(&other.inner.canonical_url))
}
}

Expand Down
Loading