dist: store temp::Context in DownloadCfg

Author: djc

src/cli/rustup_mode.rs

@@ -1012,7 +1012,7 @@ async fn update(
 
         info!("cleaning up downloads & tmp directories");
         utils::delete_dir_contents_following_links(&cfg.download_dir);
-        cfg.tmp_cx.clean();
+        dl_cfg.tmp_cx.clean();
     }
 
     Ok(exit_code)

src/config.rs

@@ -12,7 +12,7 @@ use crate::{
     cli::{common, self_update::SelfUpdateMode},
     dist::{
         self, AutoInstallMode, DistOptions, PartialToolchainDesc, Profile, TargetTriple,
-        ToolchainDesc, temp,
+        ToolchainDesc,
     },
     errors::RustupError,
     fallback_settings::FallbackSettings,
@@ -239,9 +239,9 @@ pub(crate) struct Cfg<'a> {
     pub toolchains_dir: PathBuf,
     update_hash_dir: PathBuf,
     pub download_dir: PathBuf,
-    pub tmp_cx: temp::Context,
     pub toolchain_override: Option<ResolvableToolchainName>,
     env_override: Option<LocalToolchainName>,
+    pub(crate) dist_root_server: String,
     pub dist_root_url: String,
     pub quiet: bool,
     pub current_dir: PathBuf,
@@ -300,8 +300,7 @@ impl<'a> Cfg<'a> {
         };
 
         let dist_root_server = dist_root_server(process)?;
-        let tmp_cx = temp::Context::new(rustup_dir.join("tmp"), dist_root_server.as_str());
-        let dist_root = dist_root_server + "/dist";
+        let dist_root = dist_root_server.clone() + "/dist";
 
         let cfg = Self {
             profile_override: None,
@@ -311,9 +310,9 @@ impl<'a> Cfg<'a> {
             toolchains_dir,
             update_hash_dir,
             download_dir,
-            tmp_cx,
             toolchain_override: None,
             env_override,
+            dist_root_server,
             dist_root_url: dist_root,
             quiet,
             current_dir,
@@ -954,9 +953,9 @@ impl Debug for Cfg<'_> {
             toolchains_dir,
             update_hash_dir,
             download_dir,
-            tmp_cx,
             toolchain_override,
             env_override,
+            dist_root_server,
             dist_root_url,
             quiet,
             current_dir,
@@ -971,9 +970,9 @@ impl Debug for Cfg<'_> {
             .field("toolchains_dir", toolchains_dir)
             .field("update_hash_dir", update_hash_dir)
             .field("download_dir", download_dir)
-            .field("tmp_cx", tmp_cx)
             .field("toolchain_override", toolchain_override)
             .field("env_override", env_override)
+            .field("dist_root_server", dist_root_server)
             .field("dist_root_url", dist_root_url)
             .field("quiet", quiet)
             .field("current_dir", current_dir)

src/dist/download.rs

@@ -3,7 +3,7 @@ use std::fs;
 use std::io::Read;
 use std::ops;
 use std::path::{Path, PathBuf};
-use std::sync::Mutex;
+use std::sync::{Arc, Mutex};
 use std::time::{Duration, Instant};
 
 use anyhow::{Context, Result, anyhow};
@@ -23,7 +23,7 @@ use crate::utils;
 const UPDATE_HASH_LEN: usize = 20;
 
 pub struct DownloadCfg<'a> {
-    pub tmp_cx: &'a temp::Context,
+    pub tmp_cx: Arc<temp::Context>,
     pub download_dir: &'a PathBuf,
     pub(super) tracker: DownloadTracker,
     pub(super) permit_copy_rename: bool,
@@ -34,7 +34,10 @@ impl<'a> DownloadCfg<'a> {
     /// construct a download configuration
     pub(crate) fn new(cfg: &'a Cfg<'a>) -> Self {
         DownloadCfg {
-            tmp_cx: &cfg.tmp_cx,
+            tmp_cx: Arc::new(temp::Context::new(
+                cfg.rustup_dir.join("tmp"),
+                cfg.dist_root_server.as_str(),
+            )),
             download_dir: &cfg.download_dir,
             tracker: DownloadTracker::new(!cfg.quiet, cfg.process),
             permit_copy_rename: cfg.process.permit_copy_rename(),

src/dist/manifestation.rs

@@ -110,7 +110,6 @@ impl Manifestation {
         implicit_modify: bool,
     ) -> Result<UpdateStatus> {
         // Some vars we're going to need a few times
-        let tmp_cx = download_cfg.tmp_cx;
         let prefix = self.installation.prefix();
         let rel_installed_manifest_path = prefix.rel_manifest_file(DIST_MANIFEST);
         let installed_manifest_path = prefix.path().join(&rel_installed_manifest_path);
@@ -170,7 +169,11 @@ impl Manifestation {
             .unwrap_or(DEFAULT_MAX_RETRIES);
 
         // Begin transaction
-        let mut tx = Transaction::new(prefix.clone(), tmp_cx, download_cfg.permit_copy_rename);
+        let mut tx = Transaction::new(
+            prefix.clone(),
+            &download_cfg.tmp_cx,
+            download_cfg.permit_copy_rename,
+        );
 
         // If the previous installation was from a v1 manifest we need
         // to uninstall it first.
@@ -390,7 +393,7 @@ impl Manifestation {
         info!("installing component rust");
 
         // Begin transaction
-        let mut tx = Transaction::new(prefix, dl_cfg.tmp_cx, dl_cfg.permit_copy_rename);
+        let mut tx = Transaction::new(prefix, &dl_cfg.tmp_cx, dl_cfg.permit_copy_rename);
 
         // Uninstall components
         let components = self.installation.list()?;

src/dist/manifestation/tests.rs

@@ -410,7 +410,7 @@ struct TestContext {
     prefix: InstallPrefix,
     download_dir: PathBuf,
     tp: TestProcess,
-    tmp_cx: temp::Context,
+    tmp_cx: Arc<temp::Context>,
     _tempdirs: Vec<tempfile::TempDir>,
 }
 
@@ -450,10 +450,7 @@ impl TestContext {
         );
 
         let prefix_tempdir = tempfile::Builder::new().prefix("rustup").tempdir().unwrap();
-
         let work_tempdir = tempfile::Builder::new().prefix("rustup").tempdir().unwrap();
-        let tmp_cx = temp::Context::new(work_tempdir.path().to_owned(), DEFAULT_DIST_SERVER);
-
         let toolchain = ToolchainDesc::from_str("nightly-x86_64-apple-darwin").unwrap();
         let prefix = InstallPrefix::from(prefix_tempdir.path());
         let tp = TestProcess::new(env::current_dir().unwrap(), &["rustup"], env, "");
@@ -464,7 +461,10 @@ impl TestContext {
             download_dir: prefix.path().join("downloads"),
             prefix,
             tp,
-            tmp_cx,
+            tmp_cx: Arc::new(temp::Context::new(
+                work_tempdir.path().to_owned(),
+                DEFAULT_DIST_SERVER,
+            )),
             _tempdirs: vec![prefix_tempdir, work_tempdir],
         }
     }
@@ -480,7 +480,7 @@ impl TestContext {
         force: bool,
     ) -> Result<UpdateStatus> {
         let dl_cfg = DownloadCfg {
-            tmp_cx: &self.tmp_cx,
+            tmp_cx: self.tmp_cx.clone(),
             download_dir: &self.download_dir,
             tracker: DownloadTracker::new(false, &self.tp.process),
             permit_copy_rename: self.tp.process.permit_copy_rename(),