From 222012294e953a0f5bf6e442b8a61116235c86b5 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 5 Jun 2026 02:31:07 +0900 Subject: feat(dependency-resolver): share policy via Rc, drop clone_box PolicyInterface::clone_box (a todo!() trait-object clone stub) is removed in favor of Rc shared ownership, matching PHP's by-reference sharing of the single $policy object across Solver, RuleSetGenerator and PoolOptimizer. With PoolOptimizer::new now taking an Rc, Installer::create_pool_optimizer is implemented faithfully (return new PoolOptimizer($policy)); create_policy returns the shared Rc. Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe/src/dependency_resolver/solver.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 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 4f8d91d..1fbc3ec 100644 --- a/crates/shirabe/src/dependency_resolver/solver.rs +++ b/crates/shirabe/src/dependency_resolver/solver.rs @@ -34,7 +34,7 @@ use crate::package::BasePackageHandle; #[derive(Debug)] pub struct Solver { - pub(crate) policy: Box, + pub(crate) policy: Rc, pub(crate) pool: std::rc::Rc>, pub(crate) rules: RuleSet, @@ -60,7 +60,7 @@ impl Solver { const BRANCH_LEVEL: usize = 1; pub fn new( - policy: Box, + policy: Rc, pool: std::rc::Rc>, io: std::rc::Rc>, ) -> Self { @@ -249,8 +249,7 @@ impl Solver { self.io .write_error3("Generating rules", true, crate::io::DEBUG); - let mut rule_set_generator = - RuleSetGenerator::new(self.policy.clone_box(), self.pool.clone()); + let mut rule_set_generator = RuleSetGenerator::new(self.policy.clone(), self.pool.clone()); // TODO(phase-b): get_rules_for takes Option>; // PHP passes the filter directly. Forwarding `None` here keeps the call typecheckable. let _ = platform_requirement_filter.as_ref(); -- cgit v1.3.1