download: extract DownloadCfg initialization from Cfg

Author: djc

src/config.rs

@@ -13,10 +13,7 @@ use tracing::{debug, error, info, trace, warn};
 use crate::dist::AutoInstallMode;
 use crate::{
     cli::{common, self_update::SelfUpdateMode},
-    dist::{
-        self, PartialToolchainDesc, Profile, TargetTriple, ToolchainDesc, download::DownloadCfg,
-        temp,
-    },
+    dist::{self, PartialToolchainDesc, Profile, TargetTriple, ToolchainDesc, temp},
     errors::RustupError,
     fallback_settings::FallbackSettings,
     install::UpdateStatus,
@@ -321,17 +318,6 @@ impl<'a> Cfg<'a> {
         Ok(cfg)
     }
 
-    /// construct a download configuration
-    pub(crate) fn download_cfg(&'a self) -> DownloadCfg<'a> {
-        DownloadCfg {
-            dist_root: &self.dist_root_url,
-            tmp_cx: &self.tmp_cx,
-            download_dir: &self.download_dir,
-            notify_handler: &*self.notify_handler,
-            process: self.process,
-        }
-    }
-
     pub(crate) fn set_profile_override(&mut self, profile: Profile) {
         self.profile_override = Some(profile);
     }

src/dist/download.rs

@@ -8,6 +8,7 @@ use tracing::debug;
 use tracing::warn;
 use url::Url;
 
+use crate::config::Cfg;
 use crate::dist::temp;
 use crate::download::download_file;
 use crate::download::download_file_with_resume;
@@ -40,6 +41,17 @@ impl ops::Deref for File {
 }
 
 impl<'a> DownloadCfg<'a> {
+    /// construct a download configuration
+    pub(crate) fn new(cfg: &'a Cfg<'a>) -> Self {
+        DownloadCfg {
+            dist_root: &cfg.dist_root_url,
+            tmp_cx: &cfg.tmp_cx,
+            download_dir: &cfg.download_dir,
+            notify_handler: &*cfg.notify_handler,
+            process: cfg.process,
+        }
+    }
+
     /// 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

src/toolchain/distributable.rs

@@ -13,6 +13,7 @@ use crate::{
     dist::{
         DistOptions, PartialToolchainDesc, Profile, ToolchainDesc,
         config::Config,
+        download::DownloadCfg,
         manifest::{Component, ComponentStatus, Manifest},
         manifestation::{Changes, Manifestation},
         prefix::InstallPrefix,
@@ -109,7 +110,7 @@ impl<'a> DistributableToolchain<'a> {
             remove_components: vec![],
         };
 
-        let download_cfg = self.toolchain.cfg.download_cfg();
+        let download_cfg = DownloadCfg::new(self.toolchain.cfg);
         manifestation
             .update(
                 &manifest,
@@ -352,7 +353,7 @@ impl<'a> DistributableToolchain<'a> {
             toolchain,
             profile,
             update_hash,
-            dl_cfg: cfg.download_cfg(),
+            dl_cfg: DownloadCfg::new(cfg),
             force,
             allow_downgrade: false,
             exists: false,
@@ -410,7 +411,7 @@ impl<'a> DistributableToolchain<'a> {
             toolchain: &self.desc,
             profile,
             update_hash,
-            dl_cfg: cfg.download_cfg(),
+            dl_cfg: DownloadCfg::new(cfg),
             force,
             allow_downgrade,
             exists: true,
@@ -506,7 +507,7 @@ impl<'a> DistributableToolchain<'a> {
             remove_components: vec![component],
         };
 
-        let download_cfg = self.toolchain.cfg.download_cfg();
+        let download_cfg = DownloadCfg::new(self.toolchain.cfg);
         manifestation
             .update(
                 &manifest,
@@ -523,7 +524,7 @@ impl<'a> DistributableToolchain<'a> {
 
     pub async fn show_dist_version(&self) -> anyhow::Result<Option<String>> {
         let update_hash = self.toolchain.cfg.get_hash_file(&self.desc, false)?;
-        let download_cfg = self.toolchain.cfg.download_cfg();
+        let download_cfg = DownloadCfg::new(self.toolchain.cfg);
 
         match crate::dist::dl_v2_manifest(download_cfg, Some(&update_hash), &self.desc).await? {
             Some((manifest, _)) => Ok(Some(manifest.get_rust_version()?.to_string())),