File tree Expand file tree Collapse file tree 1 file changed +1
-3
lines changed
Expand file tree Collapse file tree 1 file changed +1
-3
lines changed Original file line number Diff line number Diff line change @@ -142,9 +142,7 @@ pub fn resolve(
142142 let mut past_conflicting_activations = conflict_cache:: ConflictCache :: new ( ) ;
143143
144144 let resolver_ctx = loop {
145- let resolver_ctx = ResolverContext :: new ( ) ;
146145 let resolver_ctx = activate_deps_loop (
147- resolver_ctx,
148146 & mut registry,
149147 summaries,
150148 first_version,
@@ -199,13 +197,13 @@ pub fn resolve(
199197/// If all dependencies can be activated and resolved to a version in the
200198/// dependency graph, `cx` is returned.
201199fn activate_deps_loop (
202- mut resolver_ctx : ResolverContext ,
203200 registry : & mut RegistryQueryer < ' _ > ,
204201 summaries : & [ ( Summary , ResolveOpts ) ] ,
205202 first_version : Option < VersionOrdering > ,
206203 gctx : Option < & GlobalContext > ,
207204 past_conflicting_activations : & mut conflict_cache:: ConflictCache ,
208205) -> CargoResult < ResolverContext > {
206+ let mut resolver_ctx = ResolverContext :: new ( ) ;
209207 let mut backtrack_stack = Vec :: new ( ) ;
210208 let mut remaining_deps = RemainingDeps :: new ( ) ;
211209
You can’t perform that action at this time.
0 commit comments