From 886ee829cb191745167dca369045acd3125e5714 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 5 Jun 2026 02:36:13 +0900 Subject: 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 shared ownership, matching PHP's by-reference sharing of the single filter object. Box is replaced with Rc 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) --- .../platform_requirement_filter_factory.rs | 13 +++++++------ .../platform_requirement_filter_interface.rs | 4 ---- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'crates/shirabe/src/filter') diff --git a/crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_factory.rs b/crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_factory.rs index 35a3ed9..a260c29 100644 --- a/crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_factory.rs +++ b/crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_factory.rs @@ -8,13 +8,14 @@ use crate::filter::platform_requirement_filter::{ }; use anyhow::Result; use shirabe_php_shim::{InvalidArgumentException, PhpMixed}; +use std::rc::Rc; pub struct PlatformRequirementFilterFactory; impl PlatformRequirementFilterFactory { pub fn from_bool_or_list( bool_or_list: PhpMixed, - ) -> Result> { + ) -> Result> { match bool_or_list { PhpMixed::Bool(b) => { if b { @@ -35,7 +36,7 @@ impl PlatformRequirementFilterFactory { .collect(), _ => unreachable!(), }; - Ok(Box::new(IgnoreListPlatformRequirementFilter::new(list)?)) + Ok(Rc::new(IgnoreListPlatformRequirementFilter::new(list)?)) } other => Err(anyhow::anyhow!(InvalidArgumentException { message: format!( @@ -47,11 +48,11 @@ impl PlatformRequirementFilterFactory { } } - pub fn ignore_all() -> Box { - Box::new(IgnoreAllPlatformRequirementFilter) + pub fn ignore_all() -> Rc { + Rc::new(IgnoreAllPlatformRequirementFilter) } - pub fn ignore_nothing() -> Box { - Box::new(IgnoreNothingPlatformRequirementFilter) + pub fn ignore_nothing() -> Rc { + Rc::new(IgnoreNothingPlatformRequirementFilter) } } diff --git a/crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_interface.rs b/crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_interface.rs index 8061e1a..4ec528e 100644 --- a/crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_interface.rs +++ b/crates/shirabe/src/filter/platform_requirement_filter/platform_requirement_filter_interface.rs @@ -6,8 +6,4 @@ pub trait PlatformRequirementFilterInterface: std::fmt::Debug { fn is_upper_bound_ignored(&self, req: &str) -> bool; fn as_any(&self) -> &dyn std::any::Any; - - fn clone_box(&self) -> Box { - todo!() - } } -- cgit v1.3.1