diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-05-25 00:58:20 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-05-25 00:58:36 +0900 |
| commit | 1921f173ea219cb4b25847294d2d3fa465550fbb (patch) | |
| tree | 0d30486a2cb9a0c106e5d5827be3f655c60cd871 /crates/shirabe/src/util | |
| parent | dbdecaf5a1c54a876b7ee0153d58dd39b1080f97 (diff) | |
| download | php-shirabe-1921f173ea219cb4b25847294d2d3fa465550fbb.tar.gz php-shirabe-1921f173ea219cb4b25847294d2d3fa465550fbb.tar.zst php-shirabe-1921f173ea219cb4b25847294d2d3fa465550fbb.zip | |
refactor(package): introduce Rc<RefCell<_>> handles for packages
PHP packages have reference semantics, so introduce shared-ownership
handles over an AnyPackage enum (PackageInterfaceHandle and friends)
and replace Box<dyn PackageInterface> throughout.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/util')
| -rw-r--r-- | crates/shirabe/src/util/package_sorter.rs | 23 |
1 files changed, 11 insertions, 12 deletions
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<Box<dyn PackageInterface>>, - ) -> Option<Box<dyn PackageInterface>> { + packages: Vec<PackageInterfaceHandle>, + ) -> Option<PackageInterfaceHandle> { 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<Box<dyn PackageInterface>>, - ) -> Vec<Box<dyn PackageInterface>> { - packages.sort_by_key(|p| p.get_name().to_string()); + mut packages: Vec<PackageInterfaceHandle>, + ) -> Vec<PackageInterfaceHandle> { + packages.sort_by_key(|p| p.get_name()); packages } pub fn sort_packages( - packages: Vec<Box<dyn PackageInterface>>, + packages: Vec<PackageInterfaceHandle>, weights: IndexMap<String, i64>, - ) -> Vec<Box<dyn PackageInterface>> { + ) -> Vec<PackageInterfaceHandle> { let mut usage_list: IndexMap<String, Vec<String>> = 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<Option<Box<dyn PackageInterface>>> = + let mut packages: Vec<Option<PackageInterfaceHandle>> = packages.into_iter().map(Some).collect(); weighted_packages .into_iter() |
