Make manifestation::update async

Author: rbtcollins

src/dist/dist.rs

@@ -962,14 +962,14 @@ fn try_update_from_dist_(
 
             fetched.clone_from(&m.date);
 
-            return match manifestation.update(
+            return match utils::run_future(manifestation.update(
                 &m,
                 changes,
                 force_update,
                 &download,
                 &toolchain.manifest_name(),
                 true,
-            ) {
+            )) {
                 Ok(status) => match status {
                     UpdateStatus::Unchanged => Ok(None),
                     UpdateStatus::Changed => Ok(Some(hash)),

src/dist/manifestation.rs

@@ -98,7 +98,10 @@ impl Manifestation {
     /// distribution manifest to "rustlib/rustup-dist.toml" and a
     /// configuration containing the component name-target pairs to
     /// "rustlib/rustup-config.toml".
-    pub fn update(
+    ///
+    /// It is *not* safe to run two updates concurrently. See
+    /// https://github.com/rust-lang/rustup/issues/988 for the details.
+    pub async fn update(
         &self,
         new_manifest: &Manifest,
         changes: Changes,
@@ -172,7 +175,7 @@ impl Manifestation {
 
             let url_url = utils::parse_url(&url)?;
 
-            let downloaded_file = utils::run_future(RetryIf::spawn(
+            let downloaded_file = RetryIf::spawn(
                 FixedInterval::from_millis(0).take(max_retries),
                 || download_cfg.download(&url_url, &hash),
                 |e: &anyhow::Error| {
@@ -186,7 +189,8 @@ impl Manifestation {
                         _ => false,
                     }
                 },
-            ))
+            )
+            .await
             .with_context(|| RustupError::ComponentDownloadFailed(component.name(new_manifest)))?;
 
             things_downloaded.push(hash);

src/dist/manifestation/tests.rs

@@ -466,14 +466,14 @@ fn update_from_dist(
         remove_components: remove.to_owned(),
     };
 
-    manifestation.update(
+    utils::run_future(manifestation.update(
         &manifest,
         changes,
         force,
         download_cfg,
         &toolchain.manifest_name(),
         true,
-    )
+    ))
 }
 
 fn make_manifest_url(dist_server: &Url, toolchain: &ToolchainDesc) -> Result<Url> {

src/toolchain/distributable.rs

@@ -16,6 +16,7 @@ use crate::{
     },
     install::{InstallMethod, UpdateStatus},
     notifications::Notification,
+    utils::utils,
     RustupError,
 };
 
@@ -110,14 +111,14 @@ impl<'a> DistributableToolchain<'a> {
             &|n: crate::dist::Notification<'_>| (self.cfg.notify_handler)(n.into());
         let download_cfg = self.cfg.download_cfg(&notify_handler);
 
-        manifestation.update(
+        utils::run_future(manifestation.update(
             &manifest,
             changes,
             false,
             &download_cfg,
             &self.desc.manifest_name(),
             false,
-        )?;
+        ))?;
 
         Ok(())
     }
@@ -508,14 +509,14 @@ impl<'a> DistributableToolchain<'a> {
             &|n: crate::dist::Notification<'_>| (self.cfg.notify_handler)(n.into());
         let download_cfg = self.cfg.download_cfg(&notify_handler);
 
-        manifestation.update(
+        utils::run_future(manifestation.update(
             &manifest,
             changes,
             false,
             &download_cfg,
             &self.desc.manifest_name(),
             false,
-        )?;
+        ))?;
 
         Ok(())
     }