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.

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

Jump to bottom

fix(resolver): De-prioritize no-rust-version in MSRV resolver #13066

Merged
merged 2 commits into from
Nov 28, 2023
Merged

fix(resolver): De-prioritize no-rust-version in MSRV resolver #13066

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
defe789
test(resolver): Add more MSRV test cases
epage Nov 28, 2023
1b97a5c
fix(resolver): De-prioritize no-rust-version in MSRV resolver
epage Nov 28, 2023
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
50 changes: 40 additions & 10 deletions src/cargo/core/resolver/version_prefs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,37 @@ impl VersionPreferences {
return previous_cmp;
}

if self.max_rust_version.is_some() {
let msrv_a = a.rust_version() <= self.max_rust_version.as_ref();
let msrv_b = b.rust_version() <= self.max_rust_version.as_ref();
let msrv_cmp = msrv_a.cmp(&msrv_b).reverse();
if msrv_cmp != Ordering::Equal {
return msrv_cmp;
if let Some(max_rust_version) = &self.max_rust_version {
match (a.rust_version(), b.rust_version()) {
// Fallback
(None, None) => {}
(Some(a), Some(b)) if a == b => {}
Copy link
Contributor

Choose a reason for hiding this comment

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

Can be combined with the previous as (a, b) if a == b =>

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The compiler doesn't recognize that None == None and complains about the match being non-exhaustive

// Primary comparison
(Some(a), Some(b)) => {
let a_is_compat = a <= max_rust_version;
let b_is_compat = b <= max_rust_version;
match (a_is_compat, b_is_compat) {
(true, true) => {} // fallback
(false, false) => {} // fallback
(true, false) => return Ordering::Less,
(false, true) => return Ordering::Greater,
}
}
// Prioritize `None` over incompatible
(None, Some(b)) => {
if b <= max_rust_version {
return Ordering::Greater;
} else {
return Ordering::Less;
}
}
(Some(a), None) => {
if a <= max_rust_version {
return Ordering::Less;
} else {
return Ordering::Greater;
}
}
}
}

Expand Down Expand Up @@ -232,8 +257,11 @@ mod test {
vp.max_rust_version(Some("1.50".parse().unwrap()));

let mut summaries = vec![
summ("foo", "1.2.4", Some("1.60")),
summ("foo", "1.2.3", Some("1.50")),
summ("foo", "1.2.4", None),
summ("foo", "1.2.3", Some("1.60")),
summ("foo", "1.2.2", None),
summ("foo", "1.2.1", Some("1.50")),
summ("foo", "1.2.0", None),
summ("foo", "1.1.0", Some("1.40")),
summ("foo", "1.0.9", None),
];
Expand All @@ -242,14 +270,16 @@ mod test {
vp.sort_summaries(&mut summaries, None);
assert_eq!(
describe(&summaries),
"foo/1.2.3, foo/1.1.0, foo/1.0.9, foo/1.2.4".to_string()
"foo/1.2.1, foo/1.1.0, foo/1.2.4, foo/1.2.2, foo/1.2.0, foo/1.0.9, foo/1.2.3"
.to_string()
);

vp.version_ordering(VersionOrdering::MinimumVersionsFirst);
vp.sort_summaries(&mut summaries, None);
assert_eq!(
describe(&summaries),
"foo/1.0.9, foo/1.1.0, foo/1.2.3, foo/1.2.4".to_string()
"foo/1.1.0, foo/1.2.1, foo/1.0.9, foo/1.2.0, foo/1.2.2, foo/1.2.4, foo/1.2.3"
.to_string()
);
}
}