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/canonical_packages_trait.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'crates/shirabe/src/repository/canonical_packages_trait.rs') diff --git a/crates/shirabe/src/repository/canonical_packages_trait.rs b/crates/shirabe/src/repository/canonical_packages_trait.rs index 8c6e7c2..5f0ecff 100644 --- a/crates/shirabe/src/repository/canonical_packages_trait.rs +++ b/crates/shirabe/src/repository/canonical_packages_trait.rs @@ -1,23 +1,23 @@ //! ref: composer/src/Composer/Repository/CanonicalPackagesTrait.php -use crate::package::PackageInterface; +use crate::package::PackageInterfaceHandle; use indexmap::IndexMap; /// Provides get_canonical_packages() to various repository implementations. pub trait CanonicalPackagesTrait { - fn get_packages(&self) -> Vec>; + fn get_packages(&self) -> Vec; /// Get unique packages (at most one package of each name), with aliases resolved and removed. - fn get_canonical_packages(&self) -> Vec> { + fn get_canonical_packages(&self) -> Vec { let packages = self.get_packages(); // get at most one package of each name, preferring non-aliased ones - let mut packages_by_name: IndexMap> = IndexMap::new(); + let mut packages_by_name: IndexMap = IndexMap::new(); for package in packages { - let name = package.get_name().to_string(); + let name = package.get_name(); let prefer_replace = packages_by_name .get(&name) - .map(|existing| existing.as_alias_package().is_some()) + .map(|existing| existing.as_alias().is_some()) .unwrap_or(true); if prefer_replace { packages_by_name.insert(name, package); @@ -27,10 +27,10 @@ pub trait CanonicalPackagesTrait { let mut canonical_packages = Vec::new(); // unfold aliased packages - for package in packages_by_name.into_values() { - // TODO(phase-b): unfolding requires `Box` traversal of - // `AliasPackage::get_alias_of()` (currently returns `&BasePackage`, not an - // ownable trait object). Push the alias as-is for now. + for mut package in packages_by_name.into_values() { + while let Some(alias) = package.as_alias() { + package = alias.get_alias_of().into(); + } canonical_packages.push(package); } -- cgit v1.3.1