Move install_from_dist_if_not_installed to DistributableToolchain

Author: rbtcollins

src/cli/rustup_mode.rs

@@ -743,7 +743,8 @@ fn default_(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
         let toolchain = cfg.get_toolchain(toolchain, false)?;
 
         let status = if !toolchain.is_custom() {
-            Some(toolchain.install_from_dist_if_not_installed()?)
+            let distributable = DistributableToolchain::new(&toolchain)?;
+            Some(distributable.install_from_dist_if_not_installed()?)
         } else if !toolchain.exists() {
             return Err(ErrorKind::ToolchainNotInstalled(toolchain.name().to_string()).into());
         } else {
@@ -1251,7 +1252,8 @@ fn override_add(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
     let toolchain = cfg.get_toolchain(toolchain, false)?;
 
     let status = if !toolchain.is_custom() {
-        Some(toolchain.install_from_dist_if_not_installed()?)
+        let distributable = DistributableToolchain::new(&toolchain)?;
+        Some(distributable.install_from_dist_if_not_installed()?)
     } else if !toolchain.exists() {
         return Err(ErrorKind::ToolchainNotInstalled(toolchain.name().to_string()).into());
     } else {

src/toolchain.rs

@@ -184,22 +184,6 @@ impl<'a> Toolchain<'a> {
         }
     }
 
-    // Distributable only. Installed or not installed.
-    pub fn install_from_dist_if_not_installed(&self) -> Result<UpdateStatus> {
-        let update_hash = self.update_hash()?;
-        self.install_if_not_installed(InstallMethod::Dist(
-            &self.desc()?,
-            self.cfg.get_profile()?,
-            update_hash.as_ref().map(|p| &**p),
-            self.download_cfg(),
-            false,
-            false,
-            false,
-            None,
-            &[],
-            &[],
-        ))
-    }
     // Custom only
     pub fn is_custom(&self) -> bool {
         ToolchainDesc::from_str(&self.name).is_err()
@@ -757,6 +741,23 @@ impl<'a> DistributableToolchain<'a> {
         ))
     }
 
+    // Installed or not installed.
+    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.0.cfg.get_profile()?,
+            update_hash.as_ref().map(|p| &**p),
+            self.0.download_cfg(),
+            false,
+            false,
+            false,
+            None,
+            &[],
+            &[],
+        ))
+    }
+
     // Installed only.
     pub fn list_components(&self) -> Result<Vec<ComponentStatus>> {
         if !self.0.exists() {