Make DistributableToolChain::install async

Author: rbtcollins

src/cli/rustup_mode.rs

@@ -840,13 +840,15 @@ fn update(cfg: &mut Cfg, opts: UpdateOpts) -> Result<utils::ExitCode> {
                     allow_downgrade,
                 ))?,
                 Err(RustupError::ToolchainNotInstalled(_)) => {
-                    crate::toolchain::distributable::DistributableToolchain::install(
-                        cfg,
-                        &desc,
-                        &components,
-                        &targets,
-                        profile,
-                        force,
+                    utils::run_future(
+                        crate::toolchain::distributable::DistributableToolchain::install(
+                            cfg,
+                            &desc,
+                            &components,
+                            &targets,
+                            profile,
+                            force,
+                        ),
                     )?
                     .0
                 }
@@ -1295,14 +1297,14 @@ fn override_add(
         Err(e @ RustupError::ToolchainNotInstalled(_)) => match &toolchain_name {
             ToolchainName::Custom(_) => Err(e)?,
             ToolchainName::Official(desc) => {
-                let status = DistributableToolchain::install(
+                let status = utils::run_future(DistributableToolchain::install(
                     cfg,
                     desc,
                     &[],
                     &[],
                     cfg.get_profile()?,
                     false,
-                )?
+                ))?
                 .0;
                 writeln!(process().stdout().lock())?;
                 common::show_channel_update(

src/cli/self_update.rs

@@ -871,14 +871,14 @@ fn maybe_install_rust(
             let mut toolchain = DistributableToolchain::new(&cfg, desc.clone())?;
             utils::run_future(toolchain.update(components, targets, cfg.get_profile()?))?
         } else {
-            DistributableToolchain::install(
+            utils::run_future(DistributableToolchain::install(
                 &cfg,
                 desc,
                 components,
                 targets,
                 cfg.get_profile()?,
                 true,
-            )?
+            ))?
             .0
         };
 

src/config.rs

@@ -786,14 +786,14 @@ impl Cfg {
         let targets: Vec<_> = targets.iter().map(AsRef::as_ref).collect();
         let toolchain = match DistributableToolchain::new(self, toolchain.clone()) {
             Err(RustupError::ToolchainNotInstalled(_)) => {
-                DistributableToolchain::install(
+                utils::run_future(DistributableToolchain::install(
                     self,
                     &toolchain,
                     &components,
                     &targets,
                     profile.unwrap_or(Profile::Default),
                     false,
-                )?
+                ))?
                 .1
             }
             Ok(mut distributable) => {
@@ -944,14 +944,14 @@ impl Cfg {
                 match DistributableToolchain::new(self, desc.clone()) {
                     Err(RustupError::ToolchainNotInstalled(_)) => {
                         if install_if_missing {
-                            DistributableToolchain::install(
+                            utils::run_future(DistributableToolchain::install(
                                 self,
                                 desc,
                                 &[],
                                 &[],
                                 self.get_profile()?,
                                 true,
-                            )?;
+                            ))?;
                         }
                     }
                     o => {

src/toolchain/distributable.rs

@@ -327,7 +327,7 @@ impl<'a> DistributableToolchain<'a> {
     }
 
     #[cfg_attr(feature = "otel", tracing::instrument(err, skip_all))]
-    pub(crate) fn install(
+    pub(crate) async fn install(
         cfg: &'a Cfg,
         desc: &'_ ToolchainDesc,
         components: &[&str],
@@ -338,22 +338,21 @@ impl<'a> DistributableToolchain<'a> {
         let hash_path = cfg.get_hash_file(desc, true)?;
         let update_hash = Some(&hash_path as &Path);
 
-        let status = utils::run_future(
-            InstallMethod::Dist {
-                cfg,
-                desc,
-                profile,
-                update_hash,
-                dl_cfg: cfg.download_cfg(&|n| (cfg.notify_handler)(n.into())),
-                force,
-                allow_downgrade: false,
-                exists: false,
-                old_date_version: None,
-                components,
-                targets,
-            }
-            .install(),
-        )?;
+        let status = InstallMethod::Dist {
+            cfg,
+            desc,
+            profile,
+            update_hash,
+            dl_cfg: cfg.download_cfg(&|n| (cfg.notify_handler)(n.into())),
+            force,
+            allow_downgrade: false,
+            exists: false,
+            old_date_version: None,
+            components,
+            targets,
+        }
+        .install()
+        .await?;
         Ok((status, Self::new(cfg, desc.clone())?))
     }
 
@@ -367,7 +366,15 @@ impl<'a> DistributableToolchain<'a> {
             (cfg.notify_handler)(Notification::UsingExistingToolchain(desc));
             Ok(UpdateStatus::Unchanged)
         } else {
-            Ok(Self::install(cfg, desc, &[], &[], cfg.get_profile()?, false)?.0)
+            Ok(utils::run_future(Self::install(
+                cfg,
+                desc,
+                &[],
+                &[],
+                cfg.get_profile()?,
+                false,
+            ))?
+            .0)
         }
     }