Move desc to DistributableToolchain

Author: rbtcollins

src/cli/rustup_mode.rs

@@ -1172,8 +1172,9 @@ fn component_list(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 
 fn component_add(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
     let toolchain = explicit_or_dir_toolchain(cfg, m)?;
+    let distributable = DistributableToolchain::new(&toolchain)?;
     let target = m.value_of("target").map(TargetTriple::new).or_else(|| {
-        toolchain
+        distributable
             .desc()
             .as_ref()
             .ok()
@@ -1183,7 +1184,6 @@ fn component_add(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
     for component in m.values_of("component").unwrap() {
         let new_component = Component::new_with_target(component, false)
             .unwrap_or_else(|| Component::new(component.to_string(), target.clone(), true));
-        let distributable = DistributableToolchain::new(&toolchain)?;
         distributable.add_component(new_component)?;
     }
 
@@ -1192,8 +1192,10 @@ fn component_add(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
 
 fn component_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
     let toolchain = explicit_or_dir_toolchain(cfg, m)?;
+    let distributable = DistributableToolchain::new(&toolchain)
+        .chain_err(|| rustup::ErrorKind::ComponentsUnsupported(toolchain.name().to_string()))?;
     let target = m.value_of("target").map(TargetTriple::new).or_else(|| {
-        toolchain
+        distributable
             .desc()
             .as_ref()
             .ok()
@@ -1203,9 +1205,6 @@ fn component_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
     for component in m.values_of("component").unwrap() {
         let new_component = Component::new_with_target(component, false)
             .unwrap_or_else(|| Component::new(component.to_string(), target.clone(), true));
-
-        let distributable = DistributableToolchain::new(&toolchain)
-            .chain_err(|| rustup::ErrorKind::ComponentsUnsupported(toolchain.name().to_string()))?;
         distributable.remove_component(new_component)?;
     }
 

src/toolchain.rs

@@ -62,10 +62,6 @@ impl<'a> Toolchain<'a> {
     pub fn name(&self) -> &str {
         &self.name
     }
-    // Distributable only
-    pub fn desc(&self) -> Result<ToolchainDesc> {
-        Ok(ToolchainDesc::from_str(&self.name)?)
-    }
     pub fn path(&self) -> &Path {
         &self.path
     }
@@ -618,6 +614,11 @@ impl<'a> DistributableToolchain<'a> {
         }
     }
 
+    // Installed and not-installed?
+    pub fn desc(&self) -> Result<ToolchainDesc> {
+        Ok(ToolchainDesc::from_str(&self.0.name)?)
+    }
+
     // Installed only?
     fn get_component_suggestion(
         &self,
@@ -728,7 +729,7 @@ impl<'a> DistributableToolchain<'a> {
         let update_hash = self.0.update_hash()?;
         let old_date = self.get_manifest().ok().and_then(|m| m.map(|m| m.date));
         self.0.install(InstallMethod::Dist(
-            &self.0.desc()?,
+            &self.desc()?,
             self.0.cfg.get_profile()?,
             update_hash.as_ref().map(|p| &**p),
             self.0.download_cfg(),
@@ -745,7 +746,7 @@ impl<'a> DistributableToolchain<'a> {
     pub fn install_from_dist_if_not_installed(&self) -> Result<UpdateStatus> {
         let update_hash = self.0.update_hash()?;
         self.0.install_if_not_installed(InstallMethod::Dist(
-            &self.0.desc()?,
+            &self.desc()?,
             self.0.cfg.get_profile()?,
             update_hash.as_ref().map(|p| &**p),
             self.0.download_cfg(),
@@ -888,7 +889,7 @@ impl<'a> DistributableToolchain<'a> {
         match crate::dist::dist::dl_v2_manifest(
             self.0.download_cfg(),
             update_hash.as_ref().map(|p| &**p),
-            &self.0.desc()?,
+            &self.desc()?,
         )? {
             Some((manifest, _)) => Ok(Some(manifest.get_rust_version()?.to_string())),
             None => Ok(None),