From: Eh2406 <YeomanYaacov@gmail.com>
Date: Fri, 16 Mar 2018 19:10:58 +0000 (-0400)
Subject: Revert "Clean the `backtrack_stack` so we don't backtrack to a place with cashed... 
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~2^2~31^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f5a0f28a7c4cf6fb678c715a92fa3f9036254f65;p=cargo.git

Revert "Clean the `backtrack_stack` so we don't backtrack to a place with cashed bad activations"
---

diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs
index 4174cc0b4..fe9a8c85d 100644
--- a/src/cargo/core/resolver/mod.rs
+++ b/src/cargo/core/resolver/mod.rs
@@ -1095,18 +1095,6 @@ fn activate_deps_loop(
                             has_past_conflicting_dep = true;
                         }
                     }
-                    if !has_another && has_past_conflicting_dep && !backtracked {
-                        // we have not activated ANY candidates.
-                        // So clean the `backtrack_stack` so we don't
-                        // backtrack to a place where we will try this again.
-                        backtrack_stack.retain(|bframe| {
-                            // Maybe we could just not add them in the first place, but for now this works
-                            !bframe.context_backup.is_conflicting(
-                                Some(parent.package_id()),
-                                &conflicting_activations,
-                            )
-                        });
-                    }
                     // if not has_another we we activate for the better error messages
                     frame.just_for_error_messages = has_past_conflicting_dep;
                     if !has_past_conflicting_dep