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) --- .../shirabe/src/dependency_resolver/policy_interface.rs | 4 ---- .../shirabe/src/dependency_resolver/pool_optimizer.rs | 6 ++++-- .../src/dependency_resolver/rule_set_generator.rs | 4 ++-- crates/shirabe/src/dependency_resolver/solver.rs | 7 +++---- crates/shirabe/src/installer.rs | 17 +++++++++-------- 5 files changed, 18 insertions(+), 20 deletions(-) (limited to 'crates/shirabe/src') diff --git a/crates/shirabe/src/dependency_resolver/policy_interface.rs b/crates/shirabe/src/dependency_resolver/policy_interface.rs index 0b37dc5..b2d1263 100644 --- a/crates/shirabe/src/dependency_resolver/policy_interface.rs +++ b/crates/shirabe/src/dependency_resolver/policy_interface.rs @@ -12,8 +12,4 @@ pub trait PolicyInterface: std::fmt::Debug { literals: Vec, required_package: Option, ) -> Vec; - - fn clone_box(&self) -> Box { - todo!() - } } diff --git a/crates/shirabe/src/dependency_resolver/pool_optimizer.rs b/crates/shirabe/src/dependency_resolver/pool_optimizer.rs index 7cba910..446ff56 100644 --- a/crates/shirabe/src/dependency_resolver/pool_optimizer.rs +++ b/crates/shirabe/src/dependency_resolver/pool_optimizer.rs @@ -1,5 +1,7 @@ //! ref: composer/src/Composer/DependencyResolver/PoolOptimizer.php +use std::rc::Rc; + use anyhow::Result; use indexmap::IndexMap; use shirabe_php_shim::{LogicException, PhpMixed, implode, ksort}; @@ -20,7 +22,7 @@ use crate::package::version::VersionParser; #[derive(Debug)] pub struct PoolOptimizer { /// @var PolicyInterface - policy: Box, + policy: Rc, /// @var array irremovable_packages: IndexMap, @@ -48,7 +50,7 @@ struct IdenticalDefinitionPointers { } impl PoolOptimizer { - pub fn new(policy: Box) -> Self { + pub fn new(policy: Rc) -> Self { Self { policy, irremovable_packages: IndexMap::new(), diff --git a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs index 5979f63..6aabd6a 100644 --- a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs +++ b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs @@ -23,7 +23,7 @@ use crate::package::PackageInterfaceHandle; #[derive(Debug)] pub struct RuleSetGenerator { - pub(crate) policy: Box, + pub(crate) policy: Rc, pub(crate) pool: std::rc::Rc>, pub(crate) rules: RuleSet, pub(crate) added_map: IndexMap, @@ -32,7 +32,7 @@ pub struct RuleSetGenerator { impl RuleSetGenerator { pub fn new( - policy: Box, + policy: Rc, pool: std::rc::Rc>, ) -> Self { Self { 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(); diff --git a/crates/shirabe/src/installer.rs b/crates/shirabe/src/installer.rs index efc41c1..1f63f35 100644 --- a/crates/shirabe/src/installer.rs +++ b/crates/shirabe/src/installer.rs @@ -710,7 +710,7 @@ impl Installer { &mut lock_transaction, &platform_repo, &aliases, - &policy, + &*policy, locked_repository.as_ref(), )?; if exit_code != 0 { @@ -1401,7 +1401,7 @@ impl Installer { &mut self, for_update: bool, locked_repo: Option<&crate::repository::LockArrayRepositoryHandle>, - ) -> DefaultPolicy { + ) -> std::rc::Rc { let mut prefer_stable: Option = None; let mut prefer_lowest: Option = None; if !for_update { @@ -1437,11 +1437,11 @@ impl Installer { preferred_versions = Some(versions); } - DefaultPolicy::new( + std::rc::Rc::new(DefaultPolicy::new( prefer_stable.unwrap(), prefer_lowest.unwrap(), preferred_versions, - ) + )) } fn create_request( @@ -1615,7 +1615,10 @@ impl Installer { )); } - fn create_pool_optimizer(&self, policy: &dyn PolicyInterface) -> Option { + fn create_pool_optimizer( + &self, + policy: std::rc::Rc, + ) -> Option { // Not the best architectural decision here, would need to be able // to configure from the outside of Installer but this is only // a debugging tool and should never be required in any other use case @@ -1629,9 +1632,7 @@ impl Installer { return None; } - // TODO(phase-b): PoolOptimizer::new takes owned Box; have &dyn - let _ = policy; - todo!() + Some(PoolOptimizer::new(policy)) } fn get_audit_config(&mut self) -> anyhow::Result<&AuditConfig> { -- cgit v1.3.1