aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/dependency_resolver/rule_set_generator.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe/src/dependency_resolver/rule_set_generator.rs')
-rw-r--r--crates/shirabe/src/dependency_resolver/rule_set_generator.rs14
1 files changed, 10 insertions, 4 deletions
diff --git a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs
index d1f1f5b..d5bb1cd 100644
--- a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs
+++ b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs
@@ -236,8 +236,11 @@ impl RuleSetGenerator {
&mut self,
platform_requirement_filter: &dyn PlatformRequirementFilterInterface,
) {
- let packages: Vec<Box<dyn PackageInterface>> =
- self.added_map.values().map(|p| p.clone_box()).collect();
+ let packages: Vec<Box<dyn PackageInterface>> = self
+ .added_map
+ .values()
+ .map(|p| p.clone_package_box())
+ .collect();
for package in &packages {
for link in package.get_conflicts().values() {
@@ -283,7 +286,7 @@ impl RuleSetGenerator {
let names_packages: Vec<(String, Vec<Box<dyn PackageInterface>>)> = self
.added_packages_by_names
.iter()
- .map(|(k, v)| (k.clone(), v.iter().map(|p| p.clone_box()).collect()))
+ .map(|(k, v)| (k.clone(), v.iter().map(|p| p.clone_package_box()).collect()))
.collect();
for (name, packages) in names_packages {
@@ -304,7 +307,10 @@ impl RuleSetGenerator {
for package in request.get_fixed_packages().values() {
if package.get_id() == -1 {
// fixed package was not added to the pool as it did not pass the stability requirements, this is fine
- if self.pool.is_unacceptable_fixed_or_locked_package(package) {
+ if self
+ .pool
+ .is_unacceptable_fixed_or_locked_package(package.as_ref())
+ {
continue;
}