Skip to content

Commit 1b10550

Browse files
committed
refactor(resolver): Allow scaling number of sort cases
1 parent 0f1c9df commit 1b10550

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

src/cargo/core/resolver/version_prefs.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,14 @@ impl VersionPreferences {
7575
let prefer_a = should_prefer(&a.package_id());
7676
let prefer_b = should_prefer(&b.package_id());
7777
let previous_cmp = prefer_a.cmp(&prefer_b).reverse();
78-
match previous_cmp {
79-
Ordering::Equal => {
80-
let cmp = a.version().cmp(b.version());
81-
match first_version.unwrap_or(self.version_ordering) {
82-
VersionOrdering::MaximumVersionsFirst => cmp.reverse(),
83-
VersionOrdering::MinimumVersionsFirst => cmp,
84-
}
85-
}
86-
_ => previous_cmp,
78+
if previous_cmp != Ordering::Equal {
79+
return previous_cmp;
80+
}
81+
82+
let cmp = a.version().cmp(b.version());
83+
match first_version.unwrap_or(self.version_ordering) {
84+
VersionOrdering::MaximumVersionsFirst => cmp.reverse(),
85+
VersionOrdering::MinimumVersionsFirst => cmp,
8786
}
8887
});
8988
if first_version.is_some() {

0 commit comments

Comments
 (0)