dist: reuse existing DownloadCfg in update_v1()

Author: djc

src/dist/manifestation.rs

@@ -20,6 +20,7 @@ use crate::dist::config::Config;
 use crate::dist::download::{DownloadCfg, File};
 use crate::dist::manifest::{Component, CompressionKind, HashedBinary, Manifest, TargetedPackage};
 use crate::dist::prefix::InstallPrefix;
+#[cfg(test)]
 use crate::dist::temp;
 use crate::dist::{DEFAULT_DIST_SERVER, Profile, TargetTriple};
 use crate::errors::RustupError;
@@ -428,9 +429,7 @@ impl Manifestation {
         &self,
         new_manifest: &[String],
         update_hash: Option<&Path>,
-        tmp_cx: &temp::Context,
-        notify_handler: &dyn Fn(Notification<'_>),
-        process: &Process,
+        dl_cfg: &DownloadCfg<'_>,
     ) -> Result<Option<String>> {
         // If there's already a v2 installation then something has gone wrong
         if self.read_config()?.is_some() {
@@ -451,25 +450,16 @@ impl Manifestation {
         // Only replace once. The cost is inexpensive.
         let url = url
             .unwrap()
-            .replace(DEFAULT_DIST_SERVER, tmp_cx.dist_server.as_str());
+            .replace(DEFAULT_DIST_SERVER, dl_cfg.tmp_cx.dist_server.as_str());
 
-        notify_handler(Notification::DownloadingComponent(
+        (dl_cfg.notify_handler)(Notification::DownloadingComponent(
             "rust",
             &self.target_triple,
             Some(&self.target_triple),
             &url,
         ));
 
-        use std::path::PathBuf;
-        let dld_dir = PathBuf::from("bogus");
-        let dlcfg = DownloadCfg {
-            download_dir: &dld_dir,
-            tmp_cx,
-            notify_handler,
-            process,
-        };
-
-        let dl = dlcfg
+        let dl = dl_cfg
             .download_and_check(&url, update_hash, ".tar.gz")
             .await?;
         if dl.is_none() {
@@ -481,20 +471,21 @@ impl Manifestation {
         info!("installing component rust");
 
         // Begin transaction
-        let mut tx = Transaction::new(prefix, tmp_cx, process);
+        let mut tx = Transaction::new(prefix, dl_cfg.tmp_cx, dl_cfg.process);
 
         // Uninstall components
         let components = self.installation.list()?;
         for component in components {
-            tx = component.uninstall(tx, process)?;
+            tx = component.uninstall(tx, dl_cfg.process)?;
         }
 
         // Install all the components in the installer
-        let reader = utils::FileReaderWithProgress::new_file(&installer_file, notify_handler)?;
+        let reader =
+            utils::FileReaderWithProgress::new_file(&installer_file, dl_cfg.notify_handler)?;
         let cx = PackageContext {
-            tmp_cx,
-            notify_handler: Some(notify_handler),
-            process,
+            tmp_cx: dl_cfg.tmp_cx,
+            notify_handler: Some(dl_cfg.notify_handler),
+            process: dl_cfg.process,
         };
 
         let package: &dyn Package = &TarGzPackage::new(reader, &cx)?;

src/dist/mod.rs

@@ -1216,9 +1216,7 @@ async fn try_update_from_dist_(
         .update_v1(
             &manifest,
             update_hash,
-            download.tmp_cx,
-            &download.notify_handler,
-            download.process,
+            download,
         )
         .await;