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

Coerce major wildcards #13535

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Coerce major wildcards #13535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ce4a5c
Add tests for major wildcard coercion
Nikita240 Mar 5, 2024
ecd68bb
Implement major wild card coercion
Nikita240 Mar 5, 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
2 changes: 1 addition & 1 deletion crates/resolver-tests/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ fn meta_test_multiple_versions_strategy() {
.unwrap()
.current();
let reg = registry(input.clone());
for this in input.iter().rev().take(10) {
for this in input.iter().rev().take(11) {
let res = resolve(
vec![dep_req(&this.name(), &format!("={}", this.version()))],
&reg,
Expand Down
201 changes: 199 additions & 2 deletions crates/resolver-tests/tests/resolve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ use cargo_util::is_ci;
use resolver_tests::{
assert_contains, assert_same, dep, dep_kind, dep_loc, dep_req, loc_names, names, pkg, pkg_id,
pkg_loc, registry, registry_strategy, remove_dep, resolve, resolve_and_validated,
resolve_with_global_context, PrettyPrintRegistry, SatResolve, ToDep, ToPkgId,
resolve_with_global_context, resolve_with_global_context_raw, PrettyPrintRegistry, SatResolve,
ToDep, ToPkgId,
};

use proptest::prelude::*;
Expand Down Expand Up @@ -425,6 +426,174 @@ fn test_resolving_maximum_version_with_transitive_deps() {
assert!(!res.contains(&("util", "1.1.1").to_pkgid()));
}

#[test]
fn test_wildcard_minor() {
let reg = registry(vec![
pkg!(("util", "0.1.0")),
pkg!(("util", "0.1.1")),
pkg!("foo" => [dep_req("util", "0.1.*")]),
]);

let res = resolve_and_validated(
vec![dep_req("util", "=0.1.0"), dep_req("foo", "1.0.0")],
&reg,
None,
)
.unwrap();

assert_same(
&res,
&names(&[("root", "1.0.0"), ("foo", "1.0.0"), ("util", "0.1.0")]),
);
}

#[test]
fn test_wildcard_major() {
let reg = registry(vec![
pkg!("foo" => [dep_req("util", "0.*")]),
pkg!(("util", "0.1.0")),
pkg!(("util", "0.2.0")),
]);

let res = resolve_and_validated(
vec![dep_req("foo", "1.0.0"), dep_req("util", "=0.1.0")],
&reg,
None,
)
.unwrap();

assert_same(
&res,
&names(&[("root", "1.0.0"), ("foo", "1.0.0"), ("util", "0.1.0")]),
);
}

#[test]
fn test_range_major() {
let reg = registry(vec![
pkg!("foo" => [dep_req("util", ">=0.1,<0.3")]),
pkg!(("util", "0.1.0")),
pkg!(("util", "0.2.0")),
]);

let res = resolve_and_validated(
vec![dep_req("foo", "1.0.0"), dep_req("util", "0.1.0")],
&reg,
None,
)
.unwrap();

assert_same(
&res,
&names(&[("root", "1.0.0"), ("foo", "1.0.0"), ("util", "0.1.0")]),
);
}

#[test]
fn test_wildcard_major_duplicate_selection() {
let reg = registry(vec![
pkg!("foo" => [dep_req("util", "0.*")]),
pkg!("bar" => [dep_req("util", "0.2")]),
pkg!("car" => [dep_req("util", "0.1")]),
pkg!(("util", "0.1.0")),
pkg!(("util", "0.2.0")),
]);

let res = resolve_with_global_context_raw(
vec![
dep_req("foo", "1.0.0"),
dep_req("bar", "1.0.0"),
dep_req("car", "1.0.0"),
],
&reg,
&GlobalContext::default().unwrap(),
)
.unwrap();

// In this case, both 0.1.0 and 0.2.0 satisfy foo. It should pick the highest
// version.
assert_eq!(
res.deps(pkg_id("foo")).next().unwrap().0,
("util", "0.2.0").to_pkgid()
);

let res = res.sort();

assert_same(
&res,
&names(&[
("root", "1.0.0"),
("foo", "1.0.0"),
("bar", "1.0.0"),
("car", "1.0.0"),
("util", "0.1.0"),
("util", "0.2.0"),
]),
);
}

#[test]
fn test_wildcard_major_coerced_by_subdependency() {
let reg = registry(vec![
pkg!("foo" => [dep_req("util", "0.1")]),
pkg!(("util", "0.1.0")),
pkg!(("util", "0.2.0")),
]);

let res = resolve(vec![dep_req("foo", "1.0.0"), dep_req("util", "0.*")], &reg).unwrap();

// In this case, both 0.1.0 and 0.2.0 satisfy root, but it's being coerced
// by the subdependency of foo.
assert_same(
&res,
&names(&[("root", "1.0.0"), ("foo", "1.0.0"), ("util", "0.1.0")]),
);
}

#[test]
fn test_wildcard_major_coerced_by_indirect_subdependency() {
let reg = registry(vec![
pkg!("foo" => [dep_req("util", "0.1")]),
pkg!("bar" => [dep_req("car", "1.0.0")]),
pkg!("car" => [dep_req("util", "0.2")]),
pkg!(("util", "0.1.0")),
pkg!(("util", "0.2.0")),
pkg!(("util", "0.3.0")),
]);

let res = resolve_with_global_context_raw(
vec![
dep_req("foo", "1.0.0"),
dep_req("bar", "1.0.0"),
dep_req("util", "0.*"),
],
&reg,
&GlobalContext::default().unwrap(),
)
.unwrap();

// In this case, 0.1.0, 0.2.0 and 0.3.0 satisfy root. It should pick the highest
// version that exists in the dependency tree.
assert_eq!(
res.deps(pkg_id("root")).skip(2).next().unwrap().0,
("util", "0.2.0").to_pkgid()
);

let res = res.sort();

assert_same(
&res,
&names(&[
("root", "1.0.0"),
("foo", "1.0.0"),
("bar", "1.0.0"),
("car", "1.0.0"),
("util", "0.1.0"),
("util", "0.2.0"),
]),
);
}

#[test]
fn test_resolving_minimum_version_with_transitive_deps() {
let reg = registry(vec![
Expand Down Expand Up @@ -605,6 +774,35 @@ fn resolving_with_deep_backtracking() {
);
}

#[test]
fn resolving_with_sys_crates_duplicates() {
// This is based on issues/4902
// With `l` a normal library we get 2copies so everyone gets the newest compatible.
// But `l-sys` a library with a links attribute we make sure there is only one.
let reg = registry(vec![
pkg!(("l-sys", "0.9.1")),
pkg!(("l-sys", "0.10.0")),
pkg!(("l", "0.9.1") => [dep_req("l-sys", ">=0.8.0, <=0.10.0")]),
pkg!(("l", "0.10.0") => [dep_req("l-sys", "0.9")]),
pkg!(("d", "1.0.0") => [dep_req("l", "0.10")]),
pkg!(("r", "1.0.0") => [dep_req("l", "0.9")]),
]);

let res = resolve(vec![dep_req("d", "1"), dep_req("r", "1")], &reg).unwrap();

assert_same(
&res,
&names(&[
("root", "1.0.0"),
("d", "1.0.0"),
("r", "1.0.0"),
("l-sys", "0.9.1"),
("l", "0.9.1"),
("l", "0.10.0"),
]),
);
}

#[test]
fn resolving_with_sys_crates() {
// This is based on issues/4902
Expand All @@ -629,7 +827,6 @@ fn resolving_with_sys_crates() {
("r", "1.0.0"),
("l-sys", "0.9.1"),
("l", "0.9.1"),
("l", "0.10.0"),
]),
);
}
Expand Down
Loading