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/util/package_sorter.rs | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'crates/shirabe/src/util/package_sorter.rs') diff --git a/crates/shirabe/src/util/package_sorter.rs b/crates/shirabe/src/util/package_sorter.rs index 185f595..9db56f5 100644 --- a/crates/shirabe/src/util/package_sorter.rs +++ b/crates/shirabe/src/util/package_sorter.rs @@ -1,20 +1,19 @@ //! ref: composer/src/Composer/Util/PackageSorter.php -use std::any::Any; - use indexmap::IndexMap; use shirabe_php_shim::{strnatcasecmp, version_compare}; use crate::package::Link; use crate::package::PackageInterface; +use crate::package::PackageInterfaceHandle; use crate::package::RootPackage; pub struct PackageSorter; impl PackageSorter { pub fn get_most_current_version( - packages: Vec>, - ) -> Option> { + packages: Vec, + ) -> Option { if packages.is_empty() { return None; } @@ -25,7 +24,7 @@ impl PackageSorter { if candidate.is_default_branch() { return Some(candidate); } - if version_compare(highest.get_version(), candidate.get_version(), "<") { + if version_compare(&highest.get_version(), &candidate.get_version(), "<") { highest = candidate; } } @@ -34,16 +33,16 @@ impl PackageSorter { } pub fn sort_packages_alphabetically( - mut packages: Vec>, - ) -> Vec> { - packages.sort_by_key(|p| p.get_name().to_string()); + mut packages: Vec, + ) -> Vec { + packages.sort_by_key(|p| p.get_name()); packages } pub fn sort_packages( - packages: Vec>, + packages: Vec, weights: IndexMap, - ) -> Vec> { + ) -> Vec { let mut usage_list: IndexMap> = IndexMap::new(); for package in &packages { @@ -58,7 +57,7 @@ impl PackageSorter { usage_list .entry(target) .or_default() - .push(package.get_name().to_string()); + .push(package.get_name()); } } @@ -84,7 +83,7 @@ impl PackageSorter { } }); - let mut packages: Vec>> = + let mut packages: Vec> = packages.into_iter().map(Some).collect(); weighted_packages .into_iter() -- cgit v1.3.1