From a1c7e6908a26e10f6e1f23a51721664b5e2d838d Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 17 May 2026 02:53:53 +0900 Subject: chore(style): cargo fmt --- .../src/dependency_resolver/operation/mod.rs | 7 ++++ .../operation/update_operation.rs | 48 ++++++++++++++++------ 2 files changed, 43 insertions(+), 12 deletions(-) create mode 100644 crates/shirabe/src/dependency_resolver/operation/mod.rs (limited to 'crates/shirabe/src/dependency_resolver/operation') diff --git a/crates/shirabe/src/dependency_resolver/operation/mod.rs b/crates/shirabe/src/dependency_resolver/operation/mod.rs new file mode 100644 index 0000000..ffb0ac7 --- /dev/null +++ b/crates/shirabe/src/dependency_resolver/operation/mod.rs @@ -0,0 +1,7 @@ +pub mod install_operation; +pub mod mark_alias_installed_operation; +pub mod mark_alias_uninstalled_operation; +pub mod operation_interface; +pub mod solver_operation; +pub mod uninstall_operation; +pub mod update_operation; diff --git a/crates/shirabe/src/dependency_resolver/operation/update_operation.rs b/crates/shirabe/src/dependency_resolver/operation/update_operation.rs index eb6e9d6..618ecee 100644 --- a/crates/shirabe/src/dependency_resolver/operation/update_operation.rs +++ b/crates/shirabe/src/dependency_resolver/operation/update_operation.rs @@ -13,7 +13,10 @@ pub struct UpdateOperation { impl UpdateOperation { pub fn new(initial: Box, target: Box) -> Self { - Self { initial_package: initial, target_package: target } + Self { + initial_package: initial, + target_package: target, + } } pub fn get_initial_package(&self) -> &dyn PackageInterface { @@ -24,19 +27,36 @@ impl UpdateOperation { self.target_package.as_ref() } - pub fn format(initial_package: &dyn PackageInterface, target_package: &dyn PackageInterface, lock: bool) -> String { - let mut from_version = initial_package.get_full_pretty_version(false, PackageInterface::DISPLAY_SOURCE_REF); - let mut to_version = target_package.get_full_pretty_version(false, PackageInterface::DISPLAY_SOURCE_REF); + pub fn format( + initial_package: &dyn PackageInterface, + target_package: &dyn PackageInterface, + lock: bool, + ) -> String { + let mut from_version = + initial_package.get_full_pretty_version(false, PackageInterface::DISPLAY_SOURCE_REF); + let mut to_version = + target_package.get_full_pretty_version(false, PackageInterface::DISPLAY_SOURCE_REF); - if from_version == to_version && initial_package.get_source_reference() != target_package.get_source_reference() { - from_version = initial_package.get_full_pretty_version(true, PackageInterface::DISPLAY_SOURCE_REF); - to_version = target_package.get_full_pretty_version(true, PackageInterface::DISPLAY_SOURCE_REF); - } else if from_version == to_version && initial_package.get_dist_reference() != target_package.get_dist_reference() { - from_version = initial_package.get_full_pretty_version(true, PackageInterface::DISPLAY_DIST_REF); - to_version = target_package.get_full_pretty_version(true, PackageInterface::DISPLAY_DIST_REF); + if from_version == to_version + && initial_package.get_source_reference() != target_package.get_source_reference() + { + from_version = + initial_package.get_full_pretty_version(true, PackageInterface::DISPLAY_SOURCE_REF); + to_version = + target_package.get_full_pretty_version(true, PackageInterface::DISPLAY_SOURCE_REF); + } else if from_version == to_version + && initial_package.get_dist_reference() != target_package.get_dist_reference() + { + from_version = + initial_package.get_full_pretty_version(true, PackageInterface::DISPLAY_DIST_REF); + to_version = + target_package.get_full_pretty_version(true, PackageInterface::DISPLAY_DIST_REF); } - let action_name = if VersionParser::is_upgrade(&initial_package.get_version(), &target_package.get_version()) { + let action_name = if VersionParser::is_upgrade( + &initial_package.get_version(), + &target_package.get_version(), + ) { "Upgrading" } else { "Downgrading" @@ -62,7 +82,11 @@ impl OperationInterface for UpdateOperation { } fn show(&self, lock: bool) -> String { - Self::format(self.initial_package.as_ref(), self.target_package.as_ref(), lock) + Self::format( + self.initial_package.as_ref(), + self.target_package.as_ref(), + lock, + ) } fn to_string(&self) -> String { -- cgit v1.3.1