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/composer.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'crates/shirabe/src/composer.rs') diff --git a/crates/shirabe/src/composer.rs b/crates/shirabe/src/composer.rs index 2da4639..fe700cf 100644 --- a/crates/shirabe/src/composer.rs +++ b/crates/shirabe/src/composer.rs @@ -9,7 +9,7 @@ use crate::downloader::DownloadManager; use crate::event_dispatcher::EventDispatcher; use crate::installer::InstallationManager; use crate::package::archiver::ArchiveManager; -use crate::package::{Locker, RootPackageInterface}; +use crate::package::{Locker, RootPackageInterfaceHandle}; use crate::plugin::PluginManager; use crate::repository::RepositoryManager; use crate::util::r#loop::Loop; @@ -35,7 +35,7 @@ pub fn get_version() -> String { #[derive(Debug, Default)] pub struct PartialComposer { global: bool, - package: Option>, + package: Option, r#loop: Option>>, repository_manager: Option>>, installation_manager: Option>>, @@ -44,12 +44,12 @@ pub struct PartialComposer { } impl PartialComposer { - pub fn set_package(&mut self, package: Box) { + pub fn set_package(&mut self, package: RootPackageInterfaceHandle) { self.package = Some(package); } - pub fn get_package(&self) -> &dyn RootPackageInterface { - self.package.as_deref().unwrap() + pub fn get_package(&self) -> &RootPackageInterfaceHandle { + self.package.as_ref().unwrap() } pub fn set_config(&mut self, config: std::rc::Rc>) { @@ -193,11 +193,11 @@ impl Composer { &mut self.partial } - pub fn set_package(&mut self, package: Box) { + pub fn set_package(&mut self, package: RootPackageInterfaceHandle) { self.partial.set_package(package); } - pub fn get_package(&self) -> &dyn crate::package::RootPackageInterface { + pub fn get_package(&self) -> &RootPackageInterfaceHandle { self.partial.get_package() } @@ -316,14 +316,14 @@ impl PartialOrFullComposer { } } - pub fn set_package(&mut self, package: Box) { + pub fn set_package(&mut self, package: RootPackageInterfaceHandle) { match self { Self::Full(full) => full.set_package(package), Self::Partial(partial) => partial.set_package(package), } } - pub fn get_package(&self) -> &dyn crate::package::RootPackageInterface { + pub fn get_package(&self) -> &RootPackageInterfaceHandle { match self { Self::Full(full) => full.get_package(), Self::Partial(partial) => partial.get_package(), -- cgit v1.3.1