From 1fe1cd3fe9da3f34d8529a0c4cc89fdc61af5065 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 17 May 2026 17:44:03 +0900 Subject: fix(compile): add dyn keyword to all trait object usages (E0782) Co-Authored-By: Claude Sonnet 4.6 --- crates/shirabe/src/dependency_resolver/solver.rs | 25 ++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'crates/shirabe/src/dependency_resolver/solver.rs') diff --git a/crates/shirabe/src/dependency_resolver/solver.rs b/crates/shirabe/src/dependency_resolver/solver.rs index 388cccd..d5f4ccd 100644 --- a/crates/shirabe/src/dependency_resolver/solver.rs +++ b/crates/shirabe/src/dependency_resolver/solver.rs @@ -37,13 +37,13 @@ pub struct Solver { pub(crate) watch_graph: RuleWatchGraph, pub(crate) decisions: Decisions, - pub(crate) fixed_map: IndexMap>, + pub(crate) fixed_map: IndexMap>, pub(crate) propagate_index: i64, /// Pairs of `(literals, level)` — PHP indexes into these with the BRANCH_* constants. pub(crate) branches: Vec<(Vec, i64)>, pub(crate) problems: Vec, - pub(crate) learned_pool: Vec>, + pub(crate) learned_pool: Vec>>, pub(crate) learned_why: IndexMap, pub test_flag_learned_positive_literal: bool, @@ -292,7 +292,7 @@ impl Solver { /// If we find unit rules we make new decisions based on them /// /// Returns a `Rule` on conflict, otherwise `None`. - fn propagate(&mut self, level: i64) -> Option { + fn propagate(&mut self, level: i64) -> Option> { while self.decisions.valid_offset(self.propagate_index) { let decision = self .decisions @@ -349,7 +349,12 @@ impl Solver { /// rule (always unit) and re-propagate. /// /// returns the new solver level or 0 if unsolvable - fn set_propagate_learn(&mut self, level: i64, literal: i64, rule: Rule) -> anyhow::Result { + fn set_propagate_learn( + &mut self, + level: i64, + literal: i64, + rule: Box, + ) -> anyhow::Result { let mut level = level + 1; self.decisions.decide(literal, level, rule); @@ -401,7 +406,7 @@ impl Solver { &mut self, level: i64, decision_queue: Vec, - rule: Rule, + rule: Box, ) -> anyhow::Result { // choose best package to install from decisionQueue let mut literals = self.policy.select_preferred_packages( @@ -420,7 +425,11 @@ impl Solver { self.set_propagate_learn(level, selected_literal, rule) } - fn analyze(&mut self, level: i64, rule: Rule) -> anyhow::Result<(i64, i64, GenericRule, i64)> { + fn analyze( + &mut self, + level: i64, + rule: Box, + ) -> anyhow::Result<(i64, i64, GenericRule, i64)> { let analyzed_rule = rule.clone(); let mut rule = rule; let mut rule_level = 1_i64; @@ -591,7 +600,7 @@ impl Solver { fn analyze_unsolvable_rule( &self, problem: &mut Problem, - conflict_rule: &Rule, + conflict_rule: &dyn Rule, rule_seen: &mut IndexMap, ) { let why = spl_object_hash(conflict_rule); @@ -619,7 +628,7 @@ impl Solver { problem.add_rule(conflict_rule.clone()); } - fn analyze_unsolvable(&mut self, conflict_rule: &Rule) { + fn analyze_unsolvable(&mut self, conflict_rule: &dyn Rule) { let mut problem = Problem::new(); problem.add_rule(conflict_rule.clone()); -- cgit v1.3.1