From 1921f173ea219cb4b25847294d2d3fa465550fbb Mon Sep 17 00:00:00 2001 From: nsfisis Date: Mon, 25 May 2026 00:58:20 +0900 Subject: refactor(package): introduce Rc> handles for packages PHP packages have reference semantics, so introduce shared-ownership handles over an AnyPackage enum (PackageInterfaceHandle and friends) and replace Box throughout. Co-Authored-By: Claude Opus 4.7 (1M context) --- crates/shirabe/src/package/loader/array_loader.rs | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'crates/shirabe/src/package/loader/array_loader.rs') diff --git a/crates/shirabe/src/package/loader/array_loader.rs b/crates/shirabe/src/package/loader/array_loader.rs index 87d6e35..e1cc60b 100644 --- a/crates/shirabe/src/package/loader/array_loader.rs +++ b/crates/shirabe/src/package/loader/array_loader.rs @@ -12,11 +12,14 @@ use shirabe_php_shim::{ use crate::package::CompleteAliasPackage; use crate::package::CompletePackage; +use crate::package::CompletePackageHandle; use crate::package::CompletePackageInterface; use crate::package::Link; use crate::package::PackageInterface; +use crate::package::PackageInterfaceHandle; use crate::package::RootAliasPackage; use crate::package::RootPackage; +use crate::package::RootPackageHandle; use crate::package::loader::LoaderInterface; use crate::package::version::VersionParser; use crate::package::{BasePackage, SUPPORTED_LINK_TYPES}; @@ -51,7 +54,7 @@ impl LoaderInterface for ArrayLoader { &self, mut config: IndexMap, class: Option, - ) -> Result> { + ) -> Result { let class = class.unwrap_or_else(|| "Composer\\Package\\CompletePackage".to_string()); if class != "Composer\\Package\\CompletePackage" @@ -104,8 +107,8 @@ impl ArrayLoader { pub fn load_packages( &self, versions: Vec>, - ) -> Result>> { - let mut packages: Vec> = vec![]; + ) -> Result> { + let mut packages: Vec = vec![]; let mut link_cache: IndexMap< String, IndexMap>>, @@ -226,7 +229,7 @@ impl ArrayLoader { &self, mut package: Box, config: &mut IndexMap, - ) -> Result> { + ) -> Result { // PHP: if (!$package instanceof CompletePackage) — true by construction in Rust // (create_object always returns Box); kept as a no-op for parity. let _ = LogicException { @@ -593,12 +596,20 @@ impl ArrayLoader { // TODO(phase-b): `$package instanceof RootPackage` downcast from CompletePackage let package_as_root: Option = None; if let Some(root) = package_as_root { - let _ = RootAliasPackage::new(root, alias_normalized, pretty_alias); + let _ = RootAliasPackage::new( + RootPackageHandle::from_root_package(root), + alias_normalized, + pretty_alias, + ); // TODO(phase-b): return Box wrapped as Box todo!("phase-b: return RootAliasPackage as Box") } - let _ = CompleteAliasPackage::new(*package, alias_normalized, pretty_alias); + let _ = CompleteAliasPackage::new( + CompletePackageHandle::from_complete_package(*package), + alias_normalized, + pretty_alias, + ); // TODO(phase-b): return Box wrapped as Box todo!("phase-b: return CompleteAliasPackage as Box") } -- cgit v1.3.1