diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-06-05 02:36:13 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-06-05 02:36:13 +0900 |
| commit | 886ee829cb191745167dca369045acd3125e5714 (patch) | |
| tree | fc439e4b425dce6a10bbca92b305faef6bbb4def /crates/shirabe/src/dependency_resolver | |
| parent | 222012294e953a0f5bf6e442b8a61116235c86b5 (diff) | |
| download | php-shirabe-886ee829cb191745167dca369045acd3125e5714.tar.gz php-shirabe-886ee829cb191745167dca369045acd3125e5714.tar.zst php-shirabe-886ee829cb191745167dca369045acd3125e5714.zip | |
feat(filter): share platform req filter via Rc, drop clone_box
PlatformRequirementFilterInterface::clone_box (a todo!() trait-object
clone stub) is removed in favor of Rc<dyn ...> shared ownership, matching
PHP's by-reference sharing of the single filter object. Box<dyn ...> is
replaced with Rc<dyn ...> across the factory, Solver/RuleSetGenerator,
VersionSelector, AutoloadGenerator, Installer and the command layer
(BaseCommand/PackageDiscoveryTrait and their impls); clone_box call
sites become Rc clones.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/dependency_resolver')
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/rule_set_generator.rs | 2 | ||||
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/solver.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs index 6aabd6a..048a5f5 100644 --- a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs +++ b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs @@ -423,7 +423,7 @@ impl RuleSetGenerator { pub fn get_rules_for( &mut self, request: &Request, - platform_requirement_filter: Option<Box<dyn PlatformRequirementFilterInterface>>, + platform_requirement_filter: Option<Rc<dyn PlatformRequirementFilterInterface>>, ) -> anyhow::Result<RuleSet> { let platform_requirement_filter = platform_requirement_filter .unwrap_or_else(PlatformRequirementFilterFactory::ignore_nothing); diff --git a/crates/shirabe/src/dependency_resolver/solver.rs b/crates/shirabe/src/dependency_resolver/solver.rs index 1fbc3ec..281c796 100644 --- a/crates/shirabe/src/dependency_resolver/solver.rs +++ b/crates/shirabe/src/dependency_resolver/solver.rs @@ -240,7 +240,7 @@ impl Solver { pub fn solve( &mut self, request: &Request, - platform_requirement_filter: Option<Box<dyn PlatformRequirementFilterInterface>>, + platform_requirement_filter: Option<Rc<dyn PlatformRequirementFilterInterface>>, ) -> anyhow::Result<LockTransaction> { let platform_requirement_filter = platform_requirement_filter .unwrap_or_else(|| PlatformRequirementFilterFactory::ignore_nothing()); @@ -250,7 +250,7 @@ impl Solver { self.io .write_error3("Generating rules", true, crate::io::DEBUG); let mut rule_set_generator = RuleSetGenerator::new(self.policy.clone(), self.pool.clone()); - // TODO(phase-b): get_rules_for takes Option<Box<dyn PlatformRequirementFilterInterface>>; + // TODO(phase-b): get_rules_for takes Option<Rc<dyn PlatformRequirementFilterInterface>>; // PHP passes the filter directly. Forwarding `None` here keeps the call typecheckable. let _ = platform_requirement_filter.as_ref(); self.rules = rule_set_generator.get_rules_for(request, None)?; |
