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) --- .../src/repository/root_package_repository.rs | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'crates/shirabe/src/repository/root_package_repository.rs') diff --git a/crates/shirabe/src/repository/root_package_repository.rs b/crates/shirabe/src/repository/root_package_repository.rs index 1487f3e..71cd270 100644 --- a/crates/shirabe/src/repository/root_package_repository.rs +++ b/crates/shirabe/src/repository/root_package_repository.rs @@ -1,8 +1,9 @@ //! ref: composer/src/Composer/Repository/RootPackageRepository.php -use crate::package::BasePackage; +use crate::package::BasePackageHandle; use crate::package::PackageInterface; -use crate::package::RootPackageInterface; +use crate::package::PackageInterfaceHandle; +use crate::package::RootPackageInterfaceHandle; use crate::repository::ArrayRepository; use crate::repository::{ProviderInfo, RepositoryInterface, SearchResult}; use indexmap::IndexMap; @@ -13,13 +14,9 @@ pub struct RootPackageRepository { } impl RootPackageRepository { - pub fn new(package: Box) -> Self { + pub fn new(package: RootPackageInterfaceHandle) -> Self { Self { - // TODO(phase-b): RootPackageInterface vs BasePackage upcast + ArrayRepository::new error - inner: ArrayRepository::new(vec![todo!( - "convert Box to Box" - )]) - .expect("invalid root package"), + inner: ArrayRepository::new(vec![package.into()]).expect("invalid root package"), } } @@ -43,7 +40,7 @@ impl RepositoryInterface for RootPackageRepository { &self, name: &str, constraint: crate::repository::FindPackageConstraint, - ) -> Option> { + ) -> Option { self.inner.find_package(name, constraint) } @@ -51,11 +48,11 @@ impl RepositoryInterface for RootPackageRepository { &self, name: &str, constraint: Option, - ) -> Vec> { + ) -> Vec { self.inner.find_packages(name, constraint) } - fn get_packages(&self) -> Vec> { + fn get_packages(&self) -> Vec { self.inner.get_packages() } @@ -64,7 +61,7 @@ impl RepositoryInterface for RootPackageRepository { package_name_map: IndexMap>, acceptable_stabilities: IndexMap, stability_flags: IndexMap, - already_loaded: IndexMap>>, + already_loaded: IndexMap>, ) -> crate::repository::LoadPackagesResult { self.inner.load_packages( package_name_map, -- cgit v1.3.1