Make update_from_dist async

Author: rbtcollins

src/dist/dist.rs

@@ -703,7 +703,7 @@ pub(crate) fn valid_profile_names() -> String {
 //
 // Returns the manifest's hash if anything changed.
 #[cfg_attr(feature = "otel", tracing::instrument(err, skip_all, fields(profile=format!("{profile:?}"), prefix=prefix.path().to_string_lossy().to_string())))]
-pub(crate) fn update_from_dist(
+pub(crate) async fn update_from_dist(
     download: DownloadCfg<'_>,
     update_hash: Option<&Path>,
     toolchain: &ToolchainDesc,
@@ -724,7 +724,7 @@ pub(crate) fn update_from_dist(
         std::fs::remove_file(update_hash.unwrap())?;
     }
 
-    let res = utils::run_future(update_from_dist_(
+    let res = update_from_dist_(
         download,
         update_hash,
         toolchain,
@@ -735,7 +735,8 @@ pub(crate) fn update_from_dist(
         old_date,
         components,
         targets,
-    ));
+    )
+    .await;
 
     // Don't leave behind an empty / broken installation directory
     if res.is_err() && fresh_install {

src/install.rs

@@ -136,7 +136,7 @@ impl<'a> InstallMethod<'a> {
                 ..
             } => {
                 let prefix = &InstallPrefix::from(path.to_owned());
-                let maybe_new_hash = dist::update_from_dist(
+                let maybe_new_hash = utils::run_future(dist::update_from_dist(
                     *dl_cfg,
                     update_hash.as_deref(),
                     desc,
@@ -147,7 +147,7 @@ impl<'a> InstallMethod<'a> {
                     old_date_version.as_ref().map(|dv| dv.0.as_str()),
                     components,
                     targets,
-                )?;
+                ))?;
 
                 if let Some(hash) = maybe_new_hash {
                     if let Some(hash_file) = update_hash {