fix(DownloadCfg): remove lifetime parameters from DownloadCfg

Author: FranciscoTGouveia

src/config.rs

@@ -329,15 +329,15 @@ impl<'a> Cfg<'a> {
 
     /// construct a download configuration
     pub(crate) fn download_cfg(
-        &'a self,
+        &self,
         notify_handler: Arc<dist::notifications::NotifyHandler>,
-    ) -> DownloadCfg<'a> {
+    ) -> DownloadCfg {
         DownloadCfg {
-            dist_root: &self.dist_root_url,
+            dist_root: Arc::from(self.dist_root_url.clone()),
             tmp_cx: Arc::clone(&self.tmp_cx),
-            download_dir: &self.download_dir,
+            download_dir: Arc::new(self.download_dir.clone()),
             notify_handler,
-            process: self.process,
+            process: Arc::new(self.process.clone()),
         }
     }
 

src/dist/download.rs

@@ -18,45 +18,12 @@ use crate::utils;
 const UPDATE_HASH_LEN: usize = 20;
 
 #[derive(Clone)]
-pub struct DownloadCfg<'a> {
-    pub dist_root: &'a str,
+pub struct DownloadCfg {
+    pub dist_root: Arc<str>,
     pub tmp_cx: Arc<temp::Context>,
-    pub download_dir: &'a PathBuf,
+    pub download_dir: Arc<PathBuf>,
     pub notify_handler: Arc<NotifyHandler>,
-    pub process: &'a Process,
-}
-
-#[derive(Clone)]
-pub struct OwnedDownloadCfg {
-    pub dist_root: String,
-    pub tmp_cx: Arc<temp::Context>,
-    pub download_dir: PathBuf,
-    pub notify_handler: Arc<NotifyHandler>,
-    pub process: Process,
-}
-
-impl<'a> From<&'a OwnedDownloadCfg> for DownloadCfg<'a> {
-    fn from(odc: &'a OwnedDownloadCfg) -> Self {
-        Self {
-            dist_root: &odc.dist_root,
-            tmp_cx: Arc::clone(&odc.tmp_cx),
-            download_dir: &odc.download_dir,
-            notify_handler: Arc::clone(&odc.notify_handler),
-            process: &odc.process,
-        }
-    }
-}
-
-impl DownloadCfg<'_> {
-    pub fn to_owned(&self) -> OwnedDownloadCfg {
-        OwnedDownloadCfg {
-            dist_root: self.dist_root.to_owned(),
-            tmp_cx: Arc::clone(&self.tmp_cx),
-            download_dir: self.download_dir.clone(),
-            notify_handler: Arc::clone(&self.notify_handler),
-            process: self.process.clone(),
-        }
-    }
+    pub process: Arc<Process>,
 }
 
 pub(crate) struct File {
@@ -71,15 +38,15 @@ impl ops::Deref for File {
     }
 }
 
-impl<'a> DownloadCfg<'a> {
+impl DownloadCfg {
     /// Downloads a file and validates its hash. Resumes interrupted downloads.
     /// Partial downloads are stored in `self.download_dir`, keyed by hash. If the
     /// target file already exists, then the hash is checked and it is returned
     /// immediately without re-downloading.
     pub(crate) async fn download(&self, url: &Url, hash: &str) -> Result<File> {
         utils::ensure_dir_exists(
             "Download Directory",
-            self.download_dir,
+            &self.download_dir,
             &*self.notify_handler,
         )?;
         let target_file = self.download_dir.join(Path::new(hash));
@@ -115,7 +82,7 @@ impl<'a> DownloadCfg<'a> {
             Some(&mut hasher),
             true,
             &|n| (self.notify_handler)(n.into()),
-            self.process,
+            &self.process,
         )
         .await
         {
@@ -150,7 +117,7 @@ impl<'a> DownloadCfg<'a> {
                 &partial_file_path,
                 &target_file,
                 &*self.notify_handler,
-                self.process,
+                &self.process,
             )?;
             Ok(File { path: target_file })
         }
@@ -175,7 +142,7 @@ impl<'a> DownloadCfg<'a> {
             &hash_file,
             None,
             &|n| (self.notify_handler)(n.into()),
-            self.process,
+            &self.process,
         )
         .await?;
 
@@ -220,7 +187,7 @@ impl<'a> DownloadCfg<'a> {
             &file,
             Some(&mut hasher),
             &|n| (self.notify_handler)(n.into()),
-            self.process,
+            &self.process,
         )
         .await?;
         let actual_hash = format!("{:x}", hasher.finalize());

src/dist/manifestation.rs

@@ -109,7 +109,7 @@ impl Manifestation {
         new_manifest: Arc<Manifest>,
         changes: Changes,
         force_update: bool,
-        download_cfg: DownloadCfg<'_>,
+        download_cfg: DownloadCfg,
         toolchain_str: &str,
         implicit_modify: bool,
     ) -> Result<UpdateStatus> {
@@ -176,12 +176,12 @@ impl Manifestation {
             prefix.clone(),
             Arc::clone(&download_cfg.tmp_cx),
             Arc::clone(&download_cfg.notify_handler),
-            Arc::new(download_cfg.process.clone()),
+            Arc::clone(&download_cfg.process),
         );
 
         // If the previous installation was from a v1 manifest we need
         // to uninstall it first.
-        tx = self.maybe_handle_v2_upgrade(&config, tx, download_cfg.process)?;
+        tx = self.maybe_handle_v2_upgrade(&config, tx, &download_cfg.process)?;
 
         info!("downloading component(s)");
         for (component, _, url, _) in components.clone() {
@@ -211,7 +211,7 @@ impl Manifestation {
                 &new_manifest,
                 tx,
                 &*download_cfg.notify_handler,
-                download_cfg.process,
+                &download_cfg.process,
             )?;
         }
 
@@ -290,7 +290,6 @@ impl Manifestation {
                             let tmp_cx = download_cfg.tmp_cx.clone();
                             let download_cfg = Arc::clone(&download_cfg);
                             move || {
-                                let download_cfg = (&*download_cfg).into();
                                 this.install_component(
                                     component,
                                     format,
@@ -486,11 +485,11 @@ impl Manifestation {
         use std::path::PathBuf;
         let dld_dir = PathBuf::from("bogus");
         let dlcfg = DownloadCfg {
-            dist_root: "bogus",
-            download_dir: &dld_dir,
+            dist_root: Arc::from("bogus".to_string()),
+            download_dir: Arc::new(dld_dir),
             tmp_cx: Arc::clone(&tmp_cx),
             notify_handler: Arc::clone(&notify_handler),
-            process: &process,
+            process: Arc::clone(&process),
         };
 
         let dl = dlcfg
@@ -575,7 +574,7 @@ impl Manifestation {
         hash: String,
         altered: bool,
         tmp_cx: &temp::Context,
-        download_cfg: &DownloadCfg<'_>,
+        download_cfg: &DownloadCfg,
         max_retries: usize,
         new_manifest: &Manifest,
         notification_tx: mpsc::Sender<Result<(Component, CompressionKind, File)>>,
@@ -621,7 +620,7 @@ impl Manifestation {
         format: CompressionKind,
         installer_file: File,
         tmp_cx: Arc<temp::Context>,
-        download_cfg: DownloadCfg<'_>,
+        download_cfg: Arc<DownloadCfg>,
         new_manifest: Arc<Manifest>,
         tx: Transaction,
     ) -> Result<Transaction> {
@@ -653,7 +652,7 @@ impl Manifestation {
                     reader,
                     tmp_cx,
                     Some(&notification_converter),
-                    download_cfg.process,
+                    &download_cfg.process,
                 )?;
                 &gz
             }
@@ -662,7 +661,7 @@ impl Manifestation {
                     reader,
                     tmp_cx,
                     Some(&notification_converter),
-                    download_cfg.process,
+                    &download_cfg.process,
                 )?;
                 &xz
             }
@@ -671,7 +670,7 @@ impl Manifestation {
                     reader,
                     tmp_cx,
                     Some(&notification_converter),
-                    download_cfg.process,
+                    &download_cfg.process,
                 )?;
                 &zst
             }

src/dist/manifestation/tests.rs

@@ -473,13 +473,13 @@ impl TestContext {
         }
     }
 
-    fn default_dl_cfg(&self) -> DownloadCfg<'_> {
+    fn default_dl_cfg(&self) -> DownloadCfg {
         DownloadCfg {
-            dist_root: "phony",
+            dist_root: Arc::from("phony".to_string()),
             tmp_cx: Arc::new(self.tmp_cx.clone()),
-            download_dir: &self.download_dir,
+            download_dir: Arc::new(self.download_dir.clone()),
             notify_handler: Arc::new(|event| println!("{event}")),
-            process: &self.tp.process,
+            process: Arc::new(self.tp.process.clone()),
         }
     }
 
@@ -502,12 +502,19 @@ impl TestContext {
         add: &[Component],
         remove: &[Component],
         force: bool,
-        dl_cfg: DownloadCfg<'_>,
+        dl_cfg: DownloadCfg,
     ) -> Result<UpdateStatus> {
         // Download the dist manifest and place it into the installation prefix
         let manifest_url = make_manifest_url(&self.url, &self.toolchain)?;
         let manifest_file = Arc::new(self.tmp_cx.clone()).new_file()?;
-        download_file(&manifest_url, &manifest_file, None, &|_| {}, dl_cfg.process).await?;
+        download_file(
+            &manifest_url,
+            &manifest_file,
+            None,
+            &|_| {},
+            &dl_cfg.process,
+        )
+        .await?;
         let manifest_str = utils::read_file("manifest", &manifest_file)?;
         let manifest = Manifest::parse(&manifest_str)?;
 

src/dist/mod.rs

@@ -891,7 +891,7 @@ pub(crate) struct DistOptions<'a> {
     pub(crate) toolchain: &'a ToolchainDesc,
     pub(crate) profile: Profile,
     pub(crate) update_hash: Option<&'a Path>,
-    pub(crate) dl_cfg: DownloadCfg<'a>,
+    pub(crate) dl_cfg: DownloadCfg,
     /// --force bool is whether to force an update/install
     pub(crate) force: bool,
     /// --allow-downgrade
@@ -1066,7 +1066,7 @@ pub(crate) async fn update_from_dist(
 
 #[allow(clippy::too_many_arguments)]
 async fn try_update_from_dist_(
-    download: DownloadCfg<'_>,
+    download: DownloadCfg,
     update_hash: Option<&Path>,
     toolchain: &ToolchainDesc,
     profile: Option<Profile>,
@@ -1215,9 +1215,9 @@ async fn try_update_from_dist_(
         .update_v1(
             &manifest,
             update_hash,
-            Arc::clone(&download.tmp_cx),
+            download.tmp_cx,
             download.notify_handler,
-            Arc::new(download.process),
+            download.process,
         )
         .await;
 
@@ -1234,11 +1234,11 @@ async fn try_update_from_dist_(
 }
 
 pub(crate) async fn dl_v2_manifest(
-    download: DownloadCfg<'_>,
+    download: DownloadCfg,
     update_hash: Option<&Path>,
     toolchain: &ToolchainDesc,
 ) -> Result<Option<(ManifestV2, String)>> {
-    let manifest_url = toolchain.manifest_v2_url(download.dist_root, download.process);
+    let manifest_url = toolchain.manifest_v2_url(&download.dist_root, &download.process);
     match download
         .download_and_check(&manifest_url, update_hash, ".toml")
         .await
@@ -1264,7 +1264,7 @@ pub(crate) async fn dl_v2_manifest(
                 // Manifest checksum mismatched.
                 warn!("{err}");
 
-                let server = dist_root_server(download.process)?;
+                let server = dist_root_server(&download.process)?;
                 if server == DEFAULT_DIST_SERVER {
                     info!(
                         "this is likely due to an ongoing update of the official release server, please try again later"
@@ -1282,11 +1282,8 @@ pub(crate) async fn dl_v2_manifest(
     }
 }
 
-async fn dl_v1_manifest(
-    download: DownloadCfg<'_>,
-    toolchain: &ToolchainDesc,
-) -> Result<Vec<String>> {
-    let root_url = toolchain.package_dir(download.dist_root);
+async fn dl_v1_manifest(download: DownloadCfg, toolchain: &ToolchainDesc) -> Result<Vec<String>> {
+    let root_url = toolchain.package_dir(&download.dist_root);
 
     if let Channel::Version(ver) = &toolchain.channel {
         // This is an explicit version. In v1 there was no manifest,
@@ -1295,7 +1292,7 @@ async fn dl_v1_manifest(
         return Ok(vec![installer_name]);
     }
 
-    let manifest_url = toolchain.manifest_v1_url(download.dist_root, download.process);
+    let manifest_url = toolchain.manifest_v1_url(&download.dist_root, &download.process);
     let manifest_dl = download.download_and_check(&manifest_url, None, "").await?;
     let (manifest_file, _) = manifest_dl.unwrap();
     let manifest_str = utils::read_file("manifest", &manifest_file)?;