Make DownloadCfg::download_and_check async

Author: rbtcollins

src/dist/dist.rs

@@ -1074,7 +1074,7 @@ pub(crate) fn dl_v2_manifest(
     toolchain: &ToolchainDesc,
 ) -> Result<Option<(ManifestV2, String)>> {
     let manifest_url = toolchain.manifest_v2_url(download.dist_root);
-    match download.download_and_check(&manifest_url, update_hash, ".toml") {
+    match utils::run_future(download.download_and_check(&manifest_url, update_hash, ".toml")) {
         Ok(manifest_dl) => {
             // Downloaded ok!
             let (manifest_file, manifest_hash) = if let Some(m) = manifest_dl {
@@ -1111,7 +1111,7 @@ fn dl_v1_manifest(download: DownloadCfg<'_>, toolchain: &ToolchainDesc) -> Resul
     }
 
     let manifest_url = toolchain.manifest_v1_url(download.dist_root);
-    let manifest_dl = download.download_and_check(&manifest_url, None, "")?;
+    let manifest_dl = utils::run_future(download.download_and_check(&manifest_url, None, ""))?;
     let (manifest_file, _) = manifest_dl.unwrap();
     let manifest_str = utils::read_file("manifest", &manifest_file)?;
     let urls = manifest_str

src/dist/download.rs

@@ -143,13 +143,13 @@ impl<'a> DownloadCfg<'a> {
     /// and if they match, the download is skipped.
     /// Verifies the signature found at the same url with a `.asc` suffix, and prints a
     /// warning when the signature does not verify, or is not found.
-    pub(crate) fn download_and_check(
+    pub(crate) async fn download_and_check(
         &self,
         url_str: &str,
         update_hash: Option<&Path>,
         ext: &str,
     ) -> Result<Option<(temp::File<'a>, String)>> {
-        let hash = utils::run_future(self.download_hash(url_str))?;
+        let hash = self.download_hash(url_str).await?;
         let partial_hash: String = hash.chars().take(UPDATE_HASH_LEN).collect();
 
         if let Some(hash_file) = update_hash {
@@ -171,9 +171,10 @@ impl<'a> DownloadCfg<'a> {
         let file = self.tmp_cx.new_file_with_ext("", ext)?;
 
         let mut hasher = Sha256::new();
-        utils::run_future(utils::download_file(&url, &file, Some(&mut hasher), &|n| {
+        utils::download_file(&url, &file, Some(&mut hasher), &|n| {
             (self.notify_handler)(n.into())
-        }))?;
+        })
+        .await?;
         let actual_hash = format!("{:x}", hasher.finalize());
 
         if hash != actual_hash {

src/dist/manifestation.rs

@@ -432,7 +432,7 @@ impl Manifestation {
             notify_handler,
         };
 
-        let dl = dlcfg.download_and_check(&url, update_hash, ".tar.gz")?;
+        let dl = utils::run_future(dlcfg.download_and_check(&url, update_hash, ".tar.gz"))?;
         if dl.is_none() {
             return Ok(None);
         };