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) --- .../operation/install_operation.rs | 11 ++++++----- .../operation/mark_alias_installed_operation.rs | 10 ++++------ .../operation/mark_alias_uninstalled_operation.rs | 10 ++++------ .../operation/uninstall_operation.rs | 11 ++++++----- .../dependency_resolver/operation/update_operation.rs | 19 ++++++++++--------- 5 files changed, 30 insertions(+), 31 deletions(-) (limited to 'crates/shirabe/src/dependency_resolver/operation') diff --git a/crates/shirabe/src/dependency_resolver/operation/install_operation.rs b/crates/shirabe/src/dependency_resolver/operation/install_operation.rs index ee5e84d..466c877 100644 --- a/crates/shirabe/src/dependency_resolver/operation/install_operation.rs +++ b/crates/shirabe/src/dependency_resolver/operation/install_operation.rs @@ -3,19 +3,20 @@ use crate::dependency_resolver::operation::OperationInterface; use crate::dependency_resolver::operation::SolverOperation; use crate::package::PackageInterface; +use crate::package::PackageInterfaceHandle; #[derive(Debug)] pub struct InstallOperation { - pub(crate) package: Box, + pub(crate) package: PackageInterfaceHandle, } impl InstallOperation { - pub fn new(package: Box) -> Self { + pub fn new(package: PackageInterfaceHandle) -> Self { Self { package } } - pub fn get_package(&self) -> &dyn PackageInterface { - self.package.as_ref() + pub fn get_package(&self) -> &PackageInterfaceHandle { + &self.package } pub fn format(package: &dyn PackageInterface, lock: bool) -> String { @@ -43,7 +44,7 @@ impl OperationInterface for InstallOperation { } fn show(&self, lock: bool) -> String { - Self::format(self.package.as_ref(), lock) + Self::format(self.package.as_rc().borrow().as_package_interface(), lock) } fn to_string(&self) -> String { diff --git a/crates/shirabe/src/dependency_resolver/operation/mark_alias_installed_operation.rs b/crates/shirabe/src/dependency_resolver/operation/mark_alias_installed_operation.rs index e176b7f..339f86c 100644 --- a/crates/shirabe/src/dependency_resolver/operation/mark_alias_installed_operation.rs +++ b/crates/shirabe/src/dependency_resolver/operation/mark_alias_installed_operation.rs @@ -42,12 +42,10 @@ impl OperationInterface for MarkAliasInstalledOperation { true, ::DISPLAY_SOURCE_REF_IF_DEV, ), - PackageInterface::get_pretty_name(self.package.get_alias_of()), - PackageInterface::get_full_pretty_version( - self.package.get_alias_of(), - true, - ::DISPLAY_SOURCE_REF_IF_DEV, - ), + self.package.get_alias_of().get_pretty_name(), + self.package + .get_alias_of() + .get_full_pretty_version(true, ::DISPLAY_SOURCE_REF_IF_DEV,), ) } diff --git a/crates/shirabe/src/dependency_resolver/operation/mark_alias_uninstalled_operation.rs b/crates/shirabe/src/dependency_resolver/operation/mark_alias_uninstalled_operation.rs index 141bf4a..a5b7b7d 100644 --- a/crates/shirabe/src/dependency_resolver/operation/mark_alias_uninstalled_operation.rs +++ b/crates/shirabe/src/dependency_resolver/operation/mark_alias_uninstalled_operation.rs @@ -42,12 +42,10 @@ impl OperationInterface for MarkAliasUninstalledOperation { true, ::DISPLAY_SOURCE_REF_IF_DEV, ), - PackageInterface::get_pretty_name(self.package.get_alias_of()), - PackageInterface::get_full_pretty_version( - self.package.get_alias_of(), - true, - ::DISPLAY_SOURCE_REF_IF_DEV, - ), + self.package.get_alias_of().get_pretty_name(), + self.package + .get_alias_of() + .get_full_pretty_version(true, ::DISPLAY_SOURCE_REF_IF_DEV,), ) } diff --git a/crates/shirabe/src/dependency_resolver/operation/uninstall_operation.rs b/crates/shirabe/src/dependency_resolver/operation/uninstall_operation.rs index 5e1f6bc..2757146 100644 --- a/crates/shirabe/src/dependency_resolver/operation/uninstall_operation.rs +++ b/crates/shirabe/src/dependency_resolver/operation/uninstall_operation.rs @@ -3,19 +3,20 @@ use crate::dependency_resolver::operation::OperationInterface; use crate::dependency_resolver::operation::SolverOperation; use crate::package::PackageInterface; +use crate::package::PackageInterfaceHandle; #[derive(Debug)] pub struct UninstallOperation { - pub(crate) package: Box, + pub(crate) package: PackageInterfaceHandle, } impl UninstallOperation { - pub fn new(package: Box) -> Self { + pub fn new(package: PackageInterfaceHandle) -> Self { Self { package } } - pub fn get_package(&self) -> &dyn PackageInterface { - self.package.as_ref() + pub fn get_package(&self) -> &PackageInterfaceHandle { + &self.package } pub fn format(package: &dyn PackageInterface, _lock: bool) -> String { @@ -42,7 +43,7 @@ impl OperationInterface for UninstallOperation { } fn show(&self, lock: bool) -> String { - Self::format(self.package.as_ref(), lock) + Self::format(self.package.as_rc().borrow().as_package_interface(), lock) } fn to_string(&self) -> String { diff --git a/crates/shirabe/src/dependency_resolver/operation/update_operation.rs b/crates/shirabe/src/dependency_resolver/operation/update_operation.rs index 2ce103b..6881782 100644 --- a/crates/shirabe/src/dependency_resolver/operation/update_operation.rs +++ b/crates/shirabe/src/dependency_resolver/operation/update_operation.rs @@ -3,28 +3,29 @@ use crate::dependency_resolver::operation::OperationInterface; use crate::dependency_resolver::operation::SolverOperation; use crate::package::PackageInterface; +use crate::package::PackageInterfaceHandle; use crate::package::version::VersionParser; #[derive(Debug)] pub struct UpdateOperation { - pub(crate) initial_package: Box, - pub(crate) target_package: Box, + pub(crate) initial_package: PackageInterfaceHandle, + pub(crate) target_package: PackageInterfaceHandle, } impl UpdateOperation { - pub fn new(initial: Box, target: Box) -> Self { + pub fn new(initial: PackageInterfaceHandle, target: PackageInterfaceHandle) -> Self { Self { initial_package: initial, target_package: target, } } - pub fn get_initial_package(&self) -> &dyn PackageInterface { - self.initial_package.as_ref() + pub fn get_initial_package(&self) -> &PackageInterfaceHandle { + &self.initial_package } - pub fn get_target_package(&self) -> &dyn PackageInterface { - self.target_package.as_ref() + pub fn get_target_package(&self) -> &PackageInterfaceHandle { + &self.target_package } pub fn format( @@ -89,8 +90,8 @@ impl OperationInterface for UpdateOperation { fn show(&self, lock: bool) -> String { Self::format( - self.initial_package.as_ref(), - self.target_package.as_ref(), + self.initial_package.as_rc().borrow().as_package_interface(), + self.target_package.as_rc().borrow().as_package_interface(), lock, ) } -- cgit v1.3.1