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

reset lockfile information between resolutions #8274

Merged
merged 6 commits into from
Jun 1, 2020
Merged

reset lockfile information between resolutions #8274

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
771b2bc
Repro
ehuss May 22, 2020
46b50bb
minimize test
Eh2406 May 22, 2020
053d827
don't need to clone this string
Eh2406 May 23, 2020
8418a3a
we dont need both maps
Eh2406 May 23, 2020
61e5927
remove all residual state from previous lock files
Eh2406 May 23, 2020
8ce0d02
confirm that it is not a bug at resolver level
Eh2406 May 28, 2020
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
Prev Previous commit
confirm that it is not a bug at resolver level
  • Loading branch information
@Eh2406
Eh2406 committed May 28, 2020
commit 8ce0d029718c8288c10eb4331f86b1bd48bda20d
25 changes: 25 additions & 0 deletions crates/resolver-tests/tests/resolve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1458,6 +1458,31 @@ fn conflict_store_more_then_one_match() {
let _ = resolve_and_validated(vec![dep("nA")], &reg, None);
}

#[test]
fn bad_lockfile_from_8249() {
let input = vec![
pkg!(("a-sys", "0.2.0")),
pkg!(("a-sys", "0.1.0")),
pkg!(("b", "0.1.0") => [
dep_req("a-sys", "0.1"), // should be optional: true, but not deeded for now
]),
pkg!(("c", "1.0.0") => [
dep_req("b", "=0.1.0"),
]),
pkg!("foo" => [
dep_req("a-sys", "=0.2.0"),
{
let mut b = dep_req("b", "=0.1.0");
b.set_features(vec!["a-sys"]);
b
},
dep_req("c", "=1.0.0"),
]),
];
let reg = registry(input);
let _ = resolve_and_validated(vec![dep("foo")], &reg, None);
}

#[test]
fn cyclic_good_error_message() {
let input = vec![
Expand Down