diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-06-05 02:31:07 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-06-05 02:31:07 +0900 |
| commit | 222012294e953a0f5bf6e442b8a61116235c86b5 (patch) | |
| tree | f31bcb2d7b4c91f962be27c052db803ac6187767 /crates/shirabe/src/dependency_resolver/solver.rs | |
| parent | d59da23db4aeabd1c6807bcddce562e19b645796 (diff) | |
| download | php-shirabe-222012294e953a0f5bf6e442b8a61116235c86b5.tar.gz php-shirabe-222012294e953a0f5bf6e442b8a61116235c86b5.tar.zst php-shirabe-222012294e953a0f5bf6e442b8a61116235c86b5.zip | |
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<dyn PolicyInterface> 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) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/dependency_resolver/solver.rs')
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/solver.rs | 7 |
1 files changed, 3 insertions, 4 deletions
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<dyn PolicyInterface>, + pub(crate) policy: Rc<dyn PolicyInterface>, pub(crate) pool: std::rc::Rc<std::cell::RefCell<Pool>>, pub(crate) rules: RuleSet, @@ -60,7 +60,7 @@ impl Solver { const BRANCH_LEVEL: usize = 1; pub fn new( - policy: Box<dyn PolicyInterface>, + policy: Rc<dyn PolicyInterface>, pool: std::rc::Rc<std::cell::RefCell<Pool>>, io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>>, ) -> 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<Box<dyn PlatformRequirementFilterInterface>>; // PHP passes the filter directly. Forwarding `None` here keeps the call typecheckable. let _ = platform_requirement_filter.as_ref(); |
