Deduplicate code to get components from distributable

rust-lang · May 7, 2024 · 170ce65 · 170ce65
1 parent fd0d2ce
commit 170ce65
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 35 deletions.
diff --git a/src/cli/common.rs b/src/cli/common.rs
@@ -380,11 +380,7 @@ pub(crate) fn list_targets(
     installed_only: bool,
 ) -> Result<utils::ExitCode> {
     let mut t = process().stdout().terminal();
-    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.component.short_name_in_manifest() == "rust-std" {
             let target = component
                 .component
@@ -413,12 +409,7 @@ pub(crate) fn list_components(
     installed_only: bool,
 ) -> Result<utils::ExitCode> {
     let mut t = process().stdout().terminal();
-
-    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()? {
         let name = component.name;
         match (component.available, component.installed, installed_only) {
             (false, _, _) | (_, false, true) => continue,

diff --git a/src/cli/rustup_mode.rs b/src/cli/rustup_mode.rs
@@ -1084,14 +1084,7 @@ fn show(cfg: &Cfg, m: &ArgMatches) -> Result<utils::ExitCode> {
     // active_toolchain will carry the reason we don't have one in its detail.
     let active_targets = if let Ok(ref at) = active_toolchain {
         if let Ok(distributable) = DistributableToolchain::try_from(&at.0) {
-            let components = (|| {
-                let manifestation = distributable.get_manifestation()?;
-                let config = manifestation.read_config()?.unwrap_or_default();
-                let manifest = distributable.get_manifest()?;
-                manifest.query_components(distributable.desc(), &config)
-            })();
-
-            match components {
+            match distributable.components() {
                 Ok(cs_vec) => cs_vec
                     .into_iter()
                     .filter(|c| c.component.short_name_in_manifest() == "rust-std")
@@ -1277,11 +1270,7 @@ fn target_add(cfg: &Cfg, m: &ArgMatches) -> Result<utils::ExitCode> {
     // list_components *and* add_component would both be inappropriate for
     // custom toolchains.
     let distributable = DistributableToolchain::try_from(&toolchain)?;
-    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)?;
-
+    let components = distributable.components()?;
     let mut targets: Vec<_> = m
         .get_many::<String>("target")
         .unwrap()
@@ -1554,11 +1543,8 @@ fn doc(cfg: &Cfg, m: &ArgMatches) -> Result<utils::ExitCode> {
     let toolchain = explicit_desc_or_dir_toolchain(cfg, m)?;
 
     if let Ok(distributable) = DistributableToolchain::try_from(&toolchain) {
-        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)?;
-        if let [_] = components
+        if let [_] = distributable
+            .components()?
             .into_iter()
             .filter(|cstatus| {
                 cstatus.component.short_name_in_manifest() == "rust-docs" && !cstatus.installed

diff --git a/src/dist/manifest.rs b/src/dist/manifest.rs
@@ -594,12 +594,7 @@ impl Component {
         distributable: &DistributableToolchain<'_>,
         fallback_target: Option<&TargetTriple>,
     ) -> Result<Self> {
-        let manifestation = distributable.get_manifestation()?;
-        let config = manifestation.read_config()?.unwrap_or_default();
-        let manifest = distributable.get_manifest()?;
-        let manifest_components = manifest.query_components(distributable.desc(), &config)?;
-
-        for component_status in manifest_components {
+        for component_status in distributable.components()? {
             let short_name = component_status.component.short_name_in_manifest();
             let target = component_status.component.target.as_ref();