Skip to content

missed this important bug #5104

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
bors merged 3 commits into from
Mar 2, 2018
Merged

missed this important bug #5104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a9b68c
missed this important bug
Eh2406 Mar 2, 2018
2fa4fdf
get ci green; don't clone more than we need
Eh2406 Mar 2, 2018
d9c97de
This test should pass if we have tried to `update registry` evan if t…
Eh2406 Mar 2, 2018
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
11 changes: 7 additions & 4 deletions src/cargo/core/resolver/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,8 +778,6 @@ fn activate_deps_loop<'a>(
&mut remaining_candidates,
&mut conflicting_activations,
).ok_or_else(|| {
// if we hit an activation error and we are out of other combinations
// then just report that error
activation_error(
&cx,
registry,
Expand Down Expand Up @@ -827,8 +825,13 @@ fn activate_deps_loop<'a>(

// Add an entry to the `backtrack_stack` so
// we can try the next one if this one fails.
if has_another && successfully_activated {
backtrack_stack.push(backtrack);
if successfully_activated {
if has_another {
backtrack_stack.push(backtrack);
}
} else {
// `activate` changed `cx` and then failed so put things back.
cx = backtrack.context_backup;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/generate_lockfile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ fn no_index_update() {
.build();

assert_that(p.cargo("generate-lockfile"),
execs().with_status(0).with_stdout("")
execs().with_stdout("")
.with_stderr_contains(" Updating registry `https://github.com/rust-lang/crates.io-index`"));

assert_that(p.cargo("generate-lockfile").masquerade_as_nightly_cargo().arg("-Zno-index-update"),
Expand Down