feat(config): make create_command_for_toolchain() async

Author: rami3l

src/cli/proxy_mode.rs

@@ -55,7 +55,7 @@ async fn direct_proxy(
             cfg.create_command_for_dir(&utils::current_dir()?, arg0)
                 .await?
         }
-        Some(tc) => cfg.create_command_for_toolchain(&tc, false, arg0)?,
+        Some(tc) => cfg.create_command_for_toolchain(&tc, false, arg0).await?,
     };
     run_command_for_dir(cmd, arg0, args)
 }

src/cli/rustup_mode.rs

@@ -675,7 +675,9 @@ pub async fn main() -> Result<utils::ExitCode> {
             toolchain,
             command,
             install,
-        } => run(cfg, toolchain, command, install).map(ExitCode::from),
+        } => run(cfg, toolchain, command, install)
+            .await
+            .map(ExitCode::from),
         RustupSubcmd::Which { command, toolchain } => which(cfg, &command, toolchain).await,
         RustupSubcmd::Doc {
             path,
@@ -893,14 +895,16 @@ async fn update(cfg: &mut Cfg, opts: UpdateOpts) -> Result<utils::ExitCode> {
     Ok(utils::ExitCode(0))
 }
 
-fn run(
+async fn run(
     cfg: &Cfg,
     toolchain: ResolvableLocalToolchainName,
     command: Vec<String>,
     install: bool,
 ) -> Result<ExitStatus> {
     let toolchain = toolchain.resolve(&cfg.get_default_host_triple()?)?;
-    let cmd = cfg.create_command_for_toolchain(&toolchain, install, &command[0])?;
+    let cmd = cfg
+        .create_command_for_toolchain(&toolchain, install, &command[0])
+        .await?;
     command::run_command_for_dir(cmd, &command[0], &command[1..])
 }
 

src/config.rs

@@ -808,11 +808,9 @@ impl Cfg {
             }
             Ok(mut distributable) => {
                 if !distributable.components_exist(&components, &targets)? {
-                    utils::run_future(distributable.update(
-                        &components,
-                        &targets,
-                        profile.unwrap_or(Profile::Default),
-                    ))?;
+                    distributable
+                        .update(&components, &targets, profile.unwrap_or(Profile::Default))
+                        .await?;
                 }
                 distributable
             }
@@ -942,7 +940,7 @@ impl Cfg {
         self.create_command_for_toolchain_(toolchain, binary)
     }
 
-    pub(crate) fn create_command_for_toolchain(
+    pub(crate) async fn create_command_for_toolchain(
         &self,
         toolchain_name: &LocalToolchainName,
         install_if_missing: bool,
@@ -953,14 +951,15 @@ impl Cfg {
                 match DistributableToolchain::new(self, desc.clone()) {
                     Err(RustupError::ToolchainNotInstalled(_)) => {
                         if install_if_missing {
-                            utils::run_future(DistributableToolchain::install(
+                            DistributableToolchain::install(
                                 self,
                                 desc,
                                 &[],
                                 &[],
                                 self.get_profile()?,
                                 true,
-                            ))?;
+                            )
+                            .await?;
                         }
                     }
                     o => {