diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs index a35f2d4643b..b8d14412130 100644 --- a/src/cargo/core/resolver/mod.rs +++ b/src/cargo/core/resolver/mod.rs @@ -142,9 +142,7 @@ pub fn resolve( let mut past_conflicting_activations = conflict_cache::ConflictCache::new(); let resolver_ctx = loop { - let resolver_ctx = ResolverContext::new(); let resolver_ctx = activate_deps_loop( - resolver_ctx, &mut registry, summaries, first_version, @@ -199,13 +197,13 @@ pub fn resolve( /// If all dependencies can be activated and resolved to a version in the /// dependency graph, `cx` is returned. fn activate_deps_loop( - mut resolver_ctx: ResolverContext, registry: &mut RegistryQueryer<'_>, summaries: &[(Summary, ResolveOpts)], first_version: Option, gctx: Option<&GlobalContext>, past_conflicting_activations: &mut conflict_cache::ConflictCache, ) -> CargoResult { + let mut resolver_ctx = ResolverContext::new(); let mut backtrack_stack = Vec::new(); let mut remaining_deps = RemainingDeps::new();