diff options
Diffstat (limited to 'crates/shirabe/src/dependency_resolver')
4 files changed, 14 insertions, 14 deletions
diff --git a/crates/shirabe/src/dependency_resolver/pool_builder.rs b/crates/shirabe/src/dependency_resolver/pool_builder.rs index 98a0948d..a47952af 100644 --- a/crates/shirabe/src/dependency_resolver/pool_builder.rs +++ b/crates/shirabe/src/dependency_resolver/pool_builder.rs @@ -164,7 +164,7 @@ impl PoolBuilder { .entry(locked_package.get_name()) .or_default() .push(locked_package.clone()); - for (_k, link) in &locked_package.get_replaces() { + for (_k, link) in locked_package.get_replaces().iter() { self.skipped_load .entry(link.get_target().to_string()) .or_default() @@ -202,7 +202,7 @@ impl PoolBuilder { ); // replace means conflict, so if a fixed package replaces a name, no need to load that one, packages would conflict anyways - for (_k, link) in &package.get_replaces() { + for (_k, link) in package.get_replaces().iter() { self.loaded_packages.insert( link.get_target().to_string(), MatchAllConstraint::new(None).into(), @@ -229,7 +229,7 @@ impl PoolBuilder { } } - for (package_name, constraint) in request.get_requires() { + for (package_name, constraint) in request.get_requires().iter() { // fixed and locked packages have already been added, so if a root require needs one of them, no need to do anything if self.loaded_packages.contains_key(package_name) { continue; @@ -662,7 +662,7 @@ impl PoolBuilder { } let requires = package.get_requires(); - for (_k, link) in &requires { + for (_k, link) in requires.iter() { let require = link.get_target().to_string(); let link_constraint = link.get_constraint(); @@ -702,7 +702,7 @@ impl PoolBuilder { // if we're doing a partial update with deps we also need to unlock packages which are being replaced in case // they are currently locked and thus prevent this updateable package from being installable/updateable if propagate_update && request.get_update_allow_transitive_dependencies() { - for (_k, link) in &package.get_replaces() { + for (_k, link) in package.get_replaces().iter() { let replace = link.get_target().to_string(); if self.loaded_packages.contains_key(&replace) && self.skipped_load.contains_key(&replace) @@ -762,7 +762,7 @@ impl PoolBuilder { if root_requires.contains_key(&package_or_replacer.get_name()) { matches.push(package_or_replacer.get_name()); } - for (_k, link) in &package_or_replacer.get_replaces() { + for (_k, link) in package_or_replacer.get_replaces().iter() { if root_requires.contains_key(link.get_target()) { if name != package_or_replacer.get_name() { matches.push(format!( @@ -817,7 +817,7 @@ impl PoolBuilder { } } // update pattern matches a root require? => all good, probably a new package - for (package_name, _constraint) in request.get_requires() { + for (package_name, _constraint) in request.get_requires().iter() { if preg_is_match(&pattern_regexp, package_name) { if PlatformRepository::is_platform_package(package_name) { matched_platform_package = true; @@ -964,7 +964,7 @@ impl PoolBuilder { ); } - for (_k, replace) in &locked_package.get_replaces() { + for (_k, replace) in locked_package.get_replaces().iter() { if requires.contains_key(replace.get_target()) && self.skipped_load.contains_key(replace.get_target()) { @@ -997,7 +997,7 @@ impl PoolBuilder { let pkgs: Vec<BasePackageHandle> = self.packages.values().cloned().collect(); for package in &pkgs { - for (_k, link) in &package.get_requires() { + for (_k, link) in package.get_requires().iter() { if name == link.get_target() { self.mark_package_name_for_loading( request, diff --git a/crates/shirabe/src/dependency_resolver/pool_optimizer.rs b/crates/shirabe/src/dependency_resolver/pool_optimizer.rs index 5aca700e..c71feb4d 100644 --- a/crates/shirabe/src/dependency_resolver/pool_optimizer.rs +++ b/crates/shirabe/src/dependency_resolver/pool_optimizer.rs @@ -103,7 +103,7 @@ impl PoolOptimizer { } // Extract requested package requirements - for (require, constraint) in request.get_requires() { + for (require, constraint) in request.get_requires().iter() { self.extract_require_constraints_per_package(require, constraint.clone()); } @@ -258,7 +258,7 @@ impl PoolOptimizer { } if !package.get_replaces().is_empty() { - for (_, link) in package.get_replaces() { + for (_, link) in package.get_replaces().iter() { if CompilingMatcher::r#match( link.get_constraint(), CmpOp::Eq, diff --git a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs index aa9412c4..aebdac30 100644 --- a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs +++ b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs @@ -254,7 +254,7 @@ impl RuleSetGenerator { .into_iter() .collect(); - for conflict in &conflicts { + for conflict in conflicts.iter() { // define the conflict rule for regular packages, for alias packages it's only needed if the name // matches the conflict exactly, otherwise the name match is by provide/replace which means the // package which this is an alias of will conflict anyway, so no need to create additional rules @@ -328,7 +328,7 @@ impl RuleSetGenerator { self.add_rule(RuleSet::TYPE_REQUEST, Some(Rule::Generic(rule))); } - for (package_name, constraint) in request.get_requires() { + for (package_name, constraint) in request.get_requires().iter() { let mut constraint = constraint.clone(); if platform_requirement_filter.is_ignored(package_name) { continue; diff --git a/crates/shirabe/src/dependency_resolver/solver.rs b/crates/shirabe/src/dependency_resolver/solver.rs index cb398a0c..04cb5c9b 100644 --- a/crates/shirabe/src/dependency_resolver/solver.rs +++ b/crates/shirabe/src/dependency_resolver/solver.rs @@ -178,7 +178,7 @@ impl Solver { request: &Request, platform_requirement_filter: &dyn PlatformRequirementFilterInterface, ) -> anyhow::Result<()> { - for (package_name, constraint) in request.get_requires() { + for (package_name, constraint) in request.get_requires().iter() { let mut filtered: Option<AnyConstraint> = None; let constraint_ref: &AnyConstraint = constraint; if platform_requirement_filter.is_ignored(package_name) { |