From e873cb979ca0b2df313344f711a0a23253d1c58e Mon Sep 17 00:00:00 2001 From: "Dr. Matthias Ratajczak" Date: Thu, 5 Jan 2023 17:59:23 +0100 Subject: [PATCH] reorder Backend methods --- src/backend/pacman.rs | 16 ++++++++-------- src/backend/rust.rs | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/backend/pacman.rs b/src/backend/pacman.rs index 9c535b5..50c17ea 100644 --- a/src/backend/pacman.rs +++ b/src/backend/pacman.rs @@ -9,14 +9,6 @@ use crate::Package; pub struct Pacman; impl Backend for Pacman { - fn get_all_installed_packages() -> HashSet { - convert_to_pacdef_packages(get_all_installed_packages_from_alpm()) - } - - fn get_explicitly_installed_packages() -> HashSet { - convert_to_pacdef_packages(get_explicitly_installed_packages_from_alpm()) - } - fn get_binary() -> Binary { "paru" } @@ -28,6 +20,14 @@ impl Backend for Pacman { fn get_switches_remove() -> Switches { &["-Rsn"] } + + fn get_all_installed_packages() -> HashSet { + convert_to_pacdef_packages(get_all_installed_packages_from_alpm()) + } + + fn get_explicitly_installed_packages() -> HashSet { + convert_to_pacdef_packages(get_explicitly_installed_packages_from_alpm()) + } } fn get_all_installed_packages_from_alpm() -> HashSet { diff --git a/src/backend/rust.rs b/src/backend/rust.rs index 6f4969d..a36d91d 100644 --- a/src/backend/rust.rs +++ b/src/backend/rust.rs @@ -6,16 +6,6 @@ use crate::Package; pub struct Rust; impl Backend for Rust { - fn get_all_installed_packages() -> HashSet { - extract_packages_names(&run_cargo_install_list()) - .map(Package::from) - .collect() - } - - fn get_explicitly_installed_packages() -> HashSet { - Self::get_all_installed_packages() - } - fn get_binary() -> Binary { "cargo" } @@ -27,6 +17,16 @@ impl Backend for Rust { fn get_switches_remove() -> Switches { &["uninstall"] } + + fn get_all_installed_packages() -> HashSet { + extract_packages_names(&run_cargo_install_list()) + .map(Package::from) + .collect() + } + + fn get_explicitly_installed_packages() -> HashSet { + Self::get_all_installed_packages() + } } fn run_cargo_install_list() -> String {