Port install_from_dist to DistributableToolchain

Author: rbtcollins

src/cli/rustup_mode.rs

@@ -8,6 +8,7 @@ use crate::topical_doc;
 use clap::{App, AppSettings, Arg, ArgGroup, ArgMatches, Shell, SubCommand};
 use rustup::dist::dist::{PartialTargetTriple, PartialToolchainDesc, Profile, TargetTriple};
 use rustup::dist::manifest::Component;
+use rustup::toolchain::DistributableToolchain;
 use rustup::utils::utils::{self, ExitCode};
 use rustup::Notification;
 use rustup::{command, Cfg, ComponentStatus, Toolchain};
@@ -840,7 +841,8 @@ fn update(cfg: &mut Cfg, m: &ArgMatches<'_>) -> Result<()> {
                     .values_of("targets")
                     .map(|v| v.collect())
                     .unwrap_or_else(Vec::new);
-                Some(toolchain.install_from_dist(
+                let distributable = DistributableToolchain::new(&toolchain)?;
+                Some(distributable.install_from_dist(
                     m.is_present("force"),
                     m.is_present("allow-downgrade"),
                     &components,

src/cli/self_update.rs

@@ -35,6 +35,7 @@ use crate::errors::*;
 use crate::markdown::md;
 use crate::term2;
 use rustup::dist::dist::{self, Profile, TargetTriple};
+use rustup::toolchain::DistributableToolchain;
 use rustup::utils::utils;
 use rustup::utils::Notification;
 use rustup::{Cfg, UpdateStatus};
@@ -787,7 +788,8 @@ fn maybe_install_rust(
         if toolchain.exists() {
             warn!("Updating existing toolchain, profile choice will be ignored");
         }
-        let status = toolchain.install_from_dist(true, false, components, targets)?;
+        let distributable = DistributableToolchain::new(&toolchain)?;
+        let status = distributable.install_from_dist(true, false, components, targets)?;
         cfg.set_default(toolchain_str)?;
         println!();
         common::show_channel_update(&cfg, toolchain_str, Ok(status))?;

src/config.rs

@@ -14,7 +14,7 @@ use crate::errors::*;
 use crate::fallback_settings::FallbackSettings;
 use crate::notifications::*;
 use crate::settings::{Settings, SettingsFile, DEFAULT_METADATA_VERSION};
-use crate::toolchain::{Toolchain, UpdateStatus};
+use crate::toolchain::{DistributableToolchain, Toolchain, UpdateStatus};
 use crate::utils::utils;
 
 #[derive(Debug)]
@@ -510,7 +510,8 @@ impl Cfg {
                         ErrorKind::ToolchainNotInstalled(toolchain.name().to_string()).into(),
                     );
                 }
-                toolchain.install_from_dist(true, false, &[], &[])?;
+                let distributable = DistributableToolchain::new(&toolchain)?;
+                distributable.install_from_dist(true, false, &[], &[])?;
             }
             Ok((toolchain, reason))
         } else {
@@ -568,15 +569,16 @@ impl Cfg {
 
         // Update toolchains and collect the results
         let channels = channels.map(|(n, t)| {
-            let t = t.and_then(|t| {
-                let t = t.install_from_dist(force_update, false, &[], &[]);
-                if let Err(ref e) = t {
+            let st = t.and_then(|t| {
+                let distributable = DistributableToolchain::new(&t)?;
+                let st = distributable.install_from_dist(force_update, false, &[], &[]);
+                if let Err(ref e) = st {
                     (self.notify_handler)(Notification::NonFatalError(e));
                 }
-                t
+                st
             });
 
-            (n, t)
+            (n, st)
         });
 
         Ok(channels.collect())
@@ -620,7 +622,8 @@ impl Cfg {
     ) -> Result<Command> {
         let toolchain = self.get_toolchain(toolchain, false)?;
         if install_if_missing && !toolchain.exists() {
-            toolchain.install_from_dist(true, false, &[], &[])?;
+            let distributable = DistributableToolchain::new(&toolchain)?;
+            distributable.install_from_dist(true, false, &[], &[])?;
         }
 
         if let Some(cmd) = self.maybe_do_cargo_fallback(&toolchain, binary)? {

src/lib.rs

@@ -62,5 +62,5 @@ pub mod fallback_settings;
 mod install;
 mod notifications;
 pub mod settings;
-mod toolchain;
+pub mod toolchain;
 pub mod utils;

src/toolchain.rs

@@ -184,33 +184,6 @@ impl<'a> Toolchain<'a> {
         }
     }
 
-    // Distributable only. Not installed only?
-    pub fn install_from_dist(
-        &self,
-        force_update: bool,
-        allow_downgrade: bool,
-        components: &[&str],
-        targets: &[&str],
-    ) -> Result<UpdateStatus> {
-        let update_hash = self.update_hash()?;
-        let distributable = DistributableToolchain::new(&self)?;
-        let old_date = distributable
-            .get_manifest()
-            .ok()
-            .and_then(|m| m.map(|m| m.date));
-        self.install(InstallMethod::Dist(
-            &self.desc()?,
-            self.cfg.get_profile()?,
-            update_hash.as_ref().map(|p| &**p),
-            self.download_cfg(),
-            force_update,
-            allow_downgrade,
-            self.exists(),
-            old_date.as_ref().map(|s| &**s),
-            components,
-            targets,
-        ))
-    }
     // Distributable only. Installed or not installed.
     pub fn install_from_dist_if_not_installed(&self) -> Result<UpdateStatus> {
         let update_hash = self.update_hash()?;
@@ -900,4 +873,28 @@ impl<'a> DistributableToolchain<'a> {
 
         manifestation.load_manifest()
     }
+
+    // Not installed only?
+    pub fn install_from_dist(
+        &self,
+        force_update: bool,
+        allow_downgrade: bool,
+        components: &[&str],
+        targets: &[&str],
+    ) -> Result<UpdateStatus> {
+        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.0.cfg.get_profile()?,
+            update_hash.as_ref().map(|p| &**p),
+            self.0.download_cfg(),
+            force_update,
+            allow_downgrade,
+            self.0.exists(),
+            old_date.as_ref().map(|s| &**s),
+            components,
+            targets,
+        ))
+    }
 }