dist: move dist_root out of DownloadCfg

Author: djc

src/dist/download.rs

@@ -22,7 +22,6 @@ use crate::utils;
 const UPDATE_HASH_LEN: usize = 20;
 
 pub struct DownloadCfg<'a> {
-    pub dist_root: &'a str,
     pub tmp_cx: &'a temp::Context,
     pub download_dir: &'a PathBuf,
     pub(crate) notify_handler: &'a dyn Fn(Notification<'_>),
@@ -33,7 +32,6 @@ 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,

src/dist/manifestation.rs

@@ -463,7 +463,6 @@ impl Manifestation {
         use std::path::PathBuf;
         let dld_dir = PathBuf::from("bogus");
         let dlcfg = DownloadCfg {
-            dist_root: "bogus",
             download_dir: &dld_dir,
             tmp_cx,
             notify_handler,

src/dist/manifestation/tests.rs

@@ -480,7 +480,6 @@ impl TestContext {
         force: bool,
     ) -> Result<UpdateStatus> {
         let dl_cfg = DownloadCfg {
-            dist_root: "phony",
             tmp_cx: &self.tmp_cx,
             download_dir: &self.download_dir,
             notify_handler: &|event| println!("{event}"),

src/dist/mod.rs

@@ -979,6 +979,7 @@ pub(crate) async fn update_from_dist(
             opts.components,
             opts.targets,
             &mut fetched,
+            &opts.cfg.dist_root_url,
         )
         .await;
 
@@ -1075,13 +1076,15 @@ async fn try_update_from_dist_(
     components: &[&str],
     targets: &[&str],
     fetched: &mut String,
+    dist_root: &str,
 ) -> Result<Option<String>> {
     let toolchain_str = toolchain.to_string();
     let manifestation = Manifestation::open(prefix.clone(), toolchain.target.clone())?;
 
     // TODO: Add a notification about which manifest version is going to be used
     info!("syncing channel updates for {toolchain_str}");
     match dl_v2_manifest(
+        dist_root,
         download,
         // Even if manifest has not changed, we must continue to install requested components.
         // So if components or targets is not empty, we skip passing `update_hash` so that
@@ -1189,7 +1192,7 @@ async fn try_update_from_dist_(
     }
 
     // If the v2 manifest is not found then try v1
-    let manifest = match dl_v1_manifest(download, toolchain).await {
+    let manifest = match dl_v1_manifest(dist_root, download, toolchain).await {
         Ok(m) => m,
         Err(err) => match err.downcast_ref::<RustupError>() {
             Some(RustupError::ChecksumFailed { .. }) => return Err(err),
@@ -1232,11 +1235,12 @@ async fn try_update_from_dist_(
 }
 
 pub(crate) async fn dl_v2_manifest(
+    dist_root: &str,
     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(dist_root, download.process);
     match download
         .download_and_check(&manifest_url, update_hash, ".toml")
         .await
@@ -1281,10 +1285,11 @@ pub(crate) async fn dl_v2_manifest(
 }
 
 async fn dl_v1_manifest(
+    dist_root: &str,
     download: &DownloadCfg<'_>,
     toolchain: &ToolchainDesc,
 ) -> Result<Vec<String>> {
-    let root_url = toolchain.package_dir(download.dist_root);
+    let root_url = toolchain.package_dir(dist_root);
 
     if let Channel::Version(ver) = &toolchain.channel {
         // This is an explicit version. In v1 there was no manifest,
@@ -1293,7 +1298,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(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)?;

src/toolchain/distributable.rs

@@ -523,10 +523,13 @@ impl<'a> DistributableToolchain<'a> {
     }
 
     pub async fn show_dist_version(&self) -> anyhow::Result<Option<String>> {
+        let dist_root = &self.toolchain.cfg.dist_root_url;
         let update_hash = self.toolchain.cfg.get_hash_file(&self.desc, false)?;
         let download_cfg = DownloadCfg::new(self.toolchain.cfg);
 
-        match crate::dist::dl_v2_manifest(&download_cfg, Some(&update_hash), &self.desc).await? {
+        match crate::dist::dl_v2_manifest(dist_root, &download_cfg, Some(&update_hash), &self.desc)
+            .await?
+        {
             Some((manifest, _)) => Ok(Some(manifest.get_rust_version()?.to_string())),
             None => Ok(None),
         }