From 5f6384b6b339c349adc3baa4512986c17b3ca27e Mon Sep 17 00:00:00 2001 From: steven-omaha <35634100+steven-omaha@users.noreply.github.com> Date: Wed, 3 Apr 2024 17:46:34 +0200 Subject: [PATCH] refact(rustup): get_all_installed_packages --- crates/pacdef_core/src/backend/actual/rustup.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/crates/pacdef_core/src/backend/actual/rustup.rs b/crates/pacdef_core/src/backend/actual/rustup.rs index ee08012..0d1a3ee 100644 --- a/crates/pacdef_core/src/backend/actual/rustup.rs +++ b/crates/pacdef_core/src/backend/actual/rustup.rs @@ -35,20 +35,24 @@ impl Backend for Rustup { .run_toolchain_command(get_info_switches(Repotype::Toolchain)) .context("Getting installed toolchains")?; - let mut toolchains: HashSet = toolchains_vec + let toolchains: HashSet = toolchains_vec .iter() .map(|name| ["toolchain", name].join("/").into()) .collect(); - let packages: HashSet = self + let components: HashSet = self .run_component_command(get_info_switches(Repotype::Component), &mut toolchains_vec) .context("Getting installed components")? .iter() .map(|name| ["component", name].join("/").into()) .collect(); - toolchains.extend(packages); - Ok(toolchains) + let mut packages = HashSet::new(); + + packages.extend(toolchains); + packages.extend(components); + + Ok(packages) } fn get_explicitly_installed_packages(&self) -> Result> {