diff options
Diffstat (limited to 'crates/shirabe/src/dependency_resolver/operation')
5 files changed, 30 insertions, 31 deletions
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<dyn PackageInterface>, + pub(crate) package: PackageInterfaceHandle, } impl InstallOperation { - pub fn new(package: Box<dyn PackageInterface>) -> 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, <dyn PackageInterface>::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, - <dyn PackageInterface>::DISPLAY_SOURCE_REF_IF_DEV, - ), + self.package.get_alias_of().get_pretty_name(), + self.package + .get_alias_of() + .get_full_pretty_version(true, <dyn PackageInterface>::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, <dyn PackageInterface>::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, - <dyn PackageInterface>::DISPLAY_SOURCE_REF_IF_DEV, - ), + self.package.get_alias_of().get_pretty_name(), + self.package + .get_alias_of() + .get_full_pretty_version(true, <dyn PackageInterface>::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<dyn PackageInterface>, + pub(crate) package: PackageInterfaceHandle, } impl UninstallOperation { - pub fn new(package: Box<dyn PackageInterface>) -> 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<dyn PackageInterface>, - pub(crate) target_package: Box<dyn PackageInterface>, + pub(crate) initial_package: PackageInterfaceHandle, + pub(crate) target_package: PackageInterfaceHandle, } impl UpdateOperation { - pub fn new(initial: Box<dyn PackageInterface>, target: Box<dyn PackageInterface>) -> 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, ) } |