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/command/licenses_command.rs | 29 ++++++++++++-------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'crates/shirabe/src/command/licenses_command.rs') diff --git a/crates/shirabe/src/command/licenses_command.rs b/crates/shirabe/src/command/licenses_command.rs index 961f70b..2bcecd5 100644 --- a/crates/shirabe/src/command/licenses_command.rs +++ b/crates/shirabe/src/command/licenses_command.rs @@ -113,7 +113,11 @@ impl LicensesCommand { if input.get_option("no-dev").as_bool().unwrap_or(false) { RepositoryUtils::filter_required_packages( &repo.get_packages(), - composer.get_package(), + composer + .get_package() + .as_rc() + .borrow() + .as_package_interface(), false, vec![], ) @@ -123,11 +127,8 @@ impl LicensesCommand { }; let _ = composer.get_package(); - // TODO(phase-b): convert BasePackage trait objects to PackageInterface for sorting. - let pkg_pi: Vec> = packages - .into_iter() - .map(|p| p.clone_package_box()) - .collect(); + let pkg_pi: Vec = + packages.into_iter().map(|p| p.into()).collect(); let packages = PackageSorter::sort_packages_alphabetically(pkg_pi); let io = self.get_io(); @@ -158,7 +159,9 @@ impl LicensesCommand { PhpMixed::String("Licenses".to_string()), ]); for package in &packages { - let link = PackageInfo::get_view_source_or_homepage_url(package.as_ref()); + let link = PackageInfo::get_view_source_or_homepage_url( + package.as_rc().borrow().as_package_interface(), + ); let name = if let Some(link) = link { format!( "{}", @@ -168,9 +171,7 @@ impl LicensesCommand { } else { package.get_pretty_name().to_string() }; - let pkg_licenses = if let Some(complete_pkg) = - package.as_any().downcast_ref::() - { + let pkg_licenses = if let Some(complete_pkg) = package.as_complete_package() { complete_pkg.get_license() } else { vec![] @@ -199,9 +200,7 @@ impl LicensesCommand { let mut dependencies: IndexMap> = IndexMap::new(); for package in &packages { - let pkg_licenses = if let Some(complete_pkg) = - package.as_any().downcast_ref::() - { + let pkg_licenses = if let Some(complete_pkg) = package.as_complete_package() { complete_pkg.get_license() } else { vec![] @@ -268,9 +267,7 @@ impl LicensesCommand { "summary" => { let mut used_licenses: IndexMap = IndexMap::new(); for package in &packages { - let mut licenses = if let Some(complete_pkg) = - package.as_any().downcast_ref::() - { + let mut licenses = if let Some(complete_pkg) = package.as_complete_package() { complete_pkg.get_license() } else { vec![] -- cgit v1.3.1