From 965a826d5e5262507723556e03d2dd27be01e105 Mon Sep 17 00:00:00 2001
From: steven-omaha <35634100+steven-omaha@users.noreply.github.com>
Date: Tue, 9 Apr 2024 09:55:15 +0200
Subject: [PATCH] refact(rustup): RustupPackage::from_pacdef_packages

---
 .../src/backend/actual/rustup/mod.rs          | 20 ++-----------------
 .../src/backend/actual/rustup/types.rs        | 16 +++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/crates/pacdef_core/src/backend/actual/rustup/mod.rs b/crates/pacdef_core/src/backend/actual/rustup/mod.rs
index 6f3af8f..a55f5a8 100644
--- a/crates/pacdef_core/src/backend/actual/rustup/mod.rs
+++ b/crates/pacdef_core/src/backend/actual/rustup/mod.rs
@@ -62,7 +62,7 @@ impl Backend for Rustup {
     }
 
     fn install_packages(&self, packages: &[Package], _: bool) -> Result<ExitStatus> {
-        let packages = convert_all_packages_to_rustup_packages(packages)?;
+        let packages = RustupPackage::from_pacdef_packages(packages)?;
 
         let (toolchains, components) =
             helpers::sort_packages_into_toolchains_and_components(packages);
@@ -74,7 +74,7 @@ impl Backend for Rustup {
     }
 
     fn remove_packages(&self, packages: &[Package], _: bool) -> Result<ExitStatus> {
-        let rustup_packages = convert_all_packages_to_rustup_packages(packages)?;
+        let rustup_packages = RustupPackage::from_pacdef_packages(packages)?;
 
         let (toolchains, components) =
             helpers::sort_packages_into_toolchains_and_components(rustup_packages);
@@ -86,22 +86,6 @@ impl Backend for Rustup {
     }
 }
 
-fn convert_all_packages_to_rustup_packages(packages: &[Package]) -> Result<Vec<RustupPackage>> {
-    let mut result = vec![];
-
-    for package in packages {
-        let rustup_package = RustupPackage::try_from(package).with_context(|| {
-            format!(
-                "converting pacdef package {} to rustup package",
-                package.name
-            )
-        })?;
-        result.push(rustup_package);
-    }
-
-    Ok(result)
-}
-
 impl Rustup {
     pub(crate) fn new() -> Self {
         Self {
diff --git a/crates/pacdef_core/src/backend/actual/rustup/types.rs b/crates/pacdef_core/src/backend/actual/rustup/types.rs
index 5ed94cb..c2f62c3 100644
--- a/crates/pacdef_core/src/backend/actual/rustup/types.rs
+++ b/crates/pacdef_core/src/backend/actual/rustup/types.rs
@@ -84,6 +84,22 @@ impl RustupPackage {
             component,
         }
     }
+
+    pub fn from_pacdef_packages(packages: &[Package]) -> Result<Vec<Self>> {
+        let mut result = vec![];
+
+        for package in packages {
+            let rustup_package = Self::try_from(package).with_context(|| {
+                format!(
+                    "converting pacdef package {} to rustup package",
+                    package.name
+                )
+            })?;
+            result.push(rustup_package);
+        }
+
+        Ok(result)
+    }
 }
 
 impl TryFrom<&Package> for RustupPackage {