refactor(toolchain): extract DistributableToolchain::components()

rust-lang · Jan 15, 2024 · f2ecc75 · f2ecc75
1 parent 935a5f7
commit f2ecc75
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/cli/common.rs b/src/cli/common.rs
@@ -448,12 +448,7 @@ pub(crate) fn list_components(
 
 pub(crate) fn list_installed_components(distributable: DistributableToolchain<'_>) -> Result<()> {
     let t = process().stdout();
-    let manifestation = distributable.get_manifestation()?;
-    let config = manifestation.read_config()?.unwrap_or_default();
-    let manifest = distributable.get_manifest()?;
-    let components = manifest.query_components(distributable.desc(), &config)?;
-
-    for component in components {
+    for component in distributable.components()? {
         if component.installed {
             writeln!(t.lock(), "{}", component.name)?;
         }

diff --git a/src/toolchain/distributable.rs b/src/toolchain/distributable.rs
@@ -115,6 +115,14 @@ impl<'a> DistributableToolchain<'a> {
         Ok(())
     }
 
+    pub(crate) fn components(&self) -> anyhow::Result<Vec<crate::dist::manifest::ComponentStatus>> {
+        let manifestation = self.get_manifestation()?;
+        let config = manifestation.read_config()?.unwrap_or_default();
+        let manifest = self.get_manifest()?;
+        let components = manifest.query_components(self.desc(), &config)?;
+        Ok(components)
+    }
+
     /// Are all the components installed in this distribution
     pub(crate) fn components_exist(
         &self,