initialize single download context and later mut

Author: Shourya742

src/bootstrap/src/core/config/config.rs

@@ -738,27 +738,28 @@ impl Config {
             );
         }
 
+        let mut dwn_ctx = DownloadContext::new(
+            path_modification_cache.clone(),
+            &src,
+            rust_info.clone(),
+            &submodules,
+            download_rustc_commit.clone(),
+            host_target,
+            llvm_from_ci,
+            target_config.clone(),
+            out.clone(),
+            patch_binaries_for_nix,
+            &exec_ctx,
+            &stage0_metadata,
+            llvm_assertions,
+            &bootstrap_cache_path,
+            is_running_on_ci,
+        );
+
         let initial_rustc = if let Some(rustc) = build_rustc {
             rustc
         } else {
-            let dwn_ctx = DownloadContext::new(
-                path_modification_cache.clone(),
-                &src,
-                &rust_info,
-                &submodules,
-                &download_rustc_commit,
-                host_target,
-                llvm_from_ci,
-                &target_config,
-                &out,
-                patch_binaries_for_nix,
-                &exec_ctx,
-                &stage0_metadata,
-                llvm_assertions,
-                &bootstrap_cache_path,
-                is_running_on_ci,
-            );
-            download_beta_toolchain(dwn_ctx);
+            download_beta_toolchain(&dwn_ctx);
             out.join(host_target).join("stage0").join("bin").join(exe("rustc", host_target))
         };
 
@@ -776,24 +777,7 @@ impl Config {
         let initial_cargo = if let Some(cargo) = build_cargo {
             cargo
         } else {
-            let dwn_ctx = DownloadContext::new(
-                path_modification_cache.clone(),
-                &src,
-                &rust_info,
-                &submodules,
-                &download_rustc_commit,
-                host_target,
-                llvm_from_ci,
-                &target_config,
-                &out,
-                patch_binaries_for_nix,
-                &exec_ctx,
-                &stage0_metadata,
-                llvm_assertions,
-                &bootstrap_cache_path,
-                is_running_on_ci,
-            );
-            download_beta_toolchain(dwn_ctx);
+            download_beta_toolchain(&dwn_ctx);
             initial_sysroot.join("bin").join(exe("cargo", host_target))
         };
 
@@ -802,6 +786,7 @@ impl Config {
             let dir = out.join("tmp-dry-run");
             t!(fs::create_dir_all(&dir));
             out = dir;
+            dwn_ctx.out = out.clone();
         }
 
         let file_content = t!(fs::read_to_string(src.join("src/ci/channel")));
@@ -822,6 +807,7 @@ impl Config {
         let omit_git_hash = rust_omit_git_hash.unwrap_or(channel == "dev");
 
         rust_info = git_info(&exec_ctx, omit_git_hash, &src);
+        dwn_ctx.rust_info = rust_info.clone();
 
         let vendor = build_vendor.unwrap_or(
             rust_info.is_from_tarball()
@@ -858,25 +844,9 @@ impl Config {
             );
         }
 
-        let dwn_ctx = DownloadContext::new(
-            path_modification_cache.clone(),
-            &src,
-            &rust_info,
-            &submodules,
-            &download_rustc_commit,
-            host_target,
-            llvm_from_ci,
-            &target_config,
-            &out,
-            patch_binaries_for_nix,
-            &exec_ctx,
-            &stage0_metadata,
-            llvm_assertions,
-            &bootstrap_cache_path,
-            is_running_on_ci,
-        );
         download_rustc_commit =
-            download_ci_rustc_commit(dwn_ctx, rust_download_rustc, llvm_assertions);
+            download_ci_rustc_commit(&dwn_ctx, rust_download_rustc, llvm_assertions);
+        dwn_ctx.download_rustc_commit = download_rustc_commit.clone();
 
         if debug_assertions_requested {
             eprintln!(
@@ -885,6 +855,7 @@ impl Config {
             );
             // We need to put this later down_ci_rustc_commit.
             download_rustc_commit = None;
+            dwn_ctx.download_rustc_commit = None;
         }
 
         if let Some(t) = toml.target {
@@ -946,6 +917,7 @@ impl Config {
 
                 target_config.insert(TargetSelection::from_user(&triple), target);
             }
+            dwn_ctx.target_config = target_config.clone();
         }
 
         // We make `x86_64-unknown-linux-gnu` use the self-contained linker by default, so we will
@@ -983,25 +955,9 @@ impl Config {
                 "WARNING: `rust.download-rustc` is enabled. The `rust.channel` option will be overridden by the CI rustc's channel."
             );
 
-            let dwn_ctx = DownloadContext::new(
-                path_modification_cache.clone(),
-                &src,
-                &rust_info,
-                &submodules,
-                &download_rustc_commit,
-                host_target,
-                llvm_from_ci,
-                &target_config,
-                &out,
-                patch_binaries_for_nix,
-                &exec_ctx,
-                &stage0_metadata,
-                llvm_assertions,
-                &bootstrap_cache_path,
-                is_running_on_ci,
-            );
-            let channel_ =
-                read_file_by_commit(dwn_ctx, Path::new("src/ci/channel"), commit).trim().to_owned();
+            let channel_ = read_file_by_commit(&dwn_ctx, Path::new("src/ci/channel"), commit)
+                .trim()
+                .to_owned();
 
             channel = channel_;
         }
@@ -1010,24 +966,8 @@ impl Config {
             llvm_link_shared.set(Some(v));
         }
 
-        let dwn_ctx = DownloadContext::new(
-            path_modification_cache.clone(),
-            &src,
-            &rust_info,
-            &submodules,
-            &download_rustc_commit,
-            host_target,
-            llvm_from_ci,
-            &target_config,
-            &out,
-            patch_binaries_for_nix,
-            &exec_ctx,
-            &stage0_metadata,
-            llvm_assertions,
-            &bootstrap_cache_path,
-            is_running_on_ci,
-        );
-        llvm_from_ci = parse_download_ci_llvm(dwn_ctx, llvm_download_ci_llvm, llvm_assertions);
+        llvm_from_ci = parse_download_ci_llvm(&dwn_ctx, llvm_download_ci_llvm, llvm_assertions);
+        dwn_ctx.llvm_from_ci = llvm_from_ci;
 
         if llvm_from_ci {
             let warn = |option: &str| {
@@ -1073,55 +1013,19 @@ impl Config {
 
         if llvm_from_ci {
             let triple = &host_target.triple;
-            let dwn_ctx = DownloadContext::new(
-                path_modification_cache.clone(),
-                &src,
-                &rust_info,
-                &submodules,
-                &download_rustc_commit,
-                host_target,
-                llvm_from_ci,
-                &target_config,
-                &out,
-                patch_binaries_for_nix,
-                &exec_ctx,
-                &stage0_metadata,
-                llvm_assertions,
-                &bootstrap_cache_path,
-                is_running_on_ci,
-            );
-            let ci_llvm_bin = ci_llvm_root(dwn_ctx).join("bin");
+            let ci_llvm_bin = ci_llvm_root(&dwn_ctx).join("bin");
             let build_target =
                 target_config.entry(host_target).or_insert_with(|| Target::from_triple(triple));
+            dwn_ctx.target_config.entry(host_target).or_insert_with(|| Target::from_triple(triple));
 
             check_ci_llvm!(build_target.llvm_config);
             check_ci_llvm!(build_target.llvm_filecheck);
             build_target.llvm_config = Some(ci_llvm_bin.join(exe("llvm-config", host_target)));
             build_target.llvm_filecheck = Some(ci_llvm_bin.join(exe("FileCheck", host_target)));
         }
 
-        let initial_rustfmt = if let Some(r) = build_rustfmt {
-            Some(r)
-        } else {
-            let dwn_ctx = DownloadContext::new(
-                path_modification_cache.clone(),
-                &src,
-                &rust_info,
-                &submodules,
-                &download_rustc_commit,
-                host_target,
-                llvm_from_ci,
-                &target_config,
-                &out,
-                patch_binaries_for_nix,
-                &exec_ctx,
-                &stage0_metadata,
-                llvm_assertions,
-                &bootstrap_cache_path,
-                is_running_on_ci,
-            );
-            maybe_download_rustfmt(dwn_ctx)
-        };
+        let initial_rustfmt =
+            if let Some(r) = build_rustfmt { Some(r) } else { maybe_download_rustfmt(&dwn_ctx) };
 
         if matches!(rust_lld_mode.unwrap_or_default(), LldMode::SelfContained)
             && !lld_enabled
@@ -1132,24 +1036,7 @@ impl Config {
             );
         }
 
-        let dwn_ctx = DownloadContext::new(
-            path_modification_cache.clone(),
-            &src,
-            &rust_info,
-            &submodules,
-            &download_rustc_commit,
-            host_target,
-            llvm_from_ci,
-            &target_config,
-            &out,
-            patch_binaries_for_nix,
-            &exec_ctx,
-            &stage0_metadata,
-            llvm_assertions,
-            &bootstrap_cache_path,
-            is_running_on_ci,
-        );
-        if lld_enabled && is_system_llvm(dwn_ctx, host_target) {
+        if lld_enabled && is_system_llvm(&dwn_ctx, host_target) {
             panic!("Cannot enable LLD with `rust.lld = true` when using external llvm-config.");
         }
 
@@ -2365,7 +2252,7 @@ pub fn has_changes_from_upstream<'a>(
 )]
 pub(crate) fn update_submodule<'a>(dwn_ctx: impl AsRef<DownloadContext<'a>>, relative_path: &str) {
     let dwn_ctx = dwn_ctx.as_ref();
-    if dwn_ctx.rust_info.is_from_tarball() || !submodules_(dwn_ctx.submodules, dwn_ctx.rust_info) {
+    if dwn_ctx.rust_info.is_from_tarball() || !submodules_(dwn_ctx.submodules, &dwn_ctx.rust_info) {
         return;
     }
 

src/bootstrap/src/core/download.rs

@@ -403,13 +403,13 @@ impl Config {
 pub(crate) struct DownloadContext<'a> {
     pub path_modification_cache: Arc<Mutex<HashMap<Vec<&'static str>, PathFreshness>>>,
     pub src: &'a Path,
-    pub rust_info: &'a channel::GitInfo,
+    pub rust_info: channel::GitInfo,
     pub submodules: &'a Option<bool>,
-    pub download_rustc_commit: &'a Option<String>,
+    pub download_rustc_commit: Option<String>,
     pub host_target: TargetSelection,
     pub llvm_from_ci: bool,
-    pub target_config: &'a HashMap<TargetSelection, Target>,
-    pub out: &'a Path,
+    pub target_config: HashMap<TargetSelection, Target>,
+    pub out: PathBuf,
     pub patch_binaries_for_nix: Option<bool>,
     pub exec_ctx: &'a ExecutionContext,
     pub stage0_metadata: &'a build_helper::stage0_parser::Stage0,
@@ -423,13 +423,13 @@ impl<'a> DownloadContext<'a> {
     pub fn new(
         path_modification_cache: Arc<Mutex<HashMap<Vec<&'static str>, PathFreshness>>>,
         src: &'a Path,
-        rust_info: &'a channel::GitInfo,
+        rust_info: channel::GitInfo,
         submodules: &'a Option<bool>,
-        download_rustc_commit: &'a Option<String>,
+        download_rustc_commit: Option<String>,
         host_target: TargetSelection,
         llvm_from_ci: bool,
-        target_config: &'a HashMap<TargetSelection, Target>,
-        out: &'a Path,
+        target_config: HashMap<TargetSelection, Target>,
+        out: PathBuf,
         patch_binaries_for_nix: Option<bool>,
         exec_ctx: &'a ExecutionContext,
         stage0_metadata: &'a build_helper::stage0_parser::Stage0,
@@ -469,12 +469,12 @@ impl<'a> From<&'a Config> for DownloadContext<'a> {
             path_modification_cache: value.path_modification_cache.clone(),
             src: &value.src,
             host_target: value.host_target,
-            rust_info: &value.rust_info,
-            download_rustc_commit: &value.download_rustc_commit,
+            rust_info: value.rust_info.clone(),
+            download_rustc_commit: value.download_rustc_commit.clone(),
             submodules: &value.submodules,
             llvm_from_ci: value.llvm_from_ci,
-            target_config: &value.target_config,
-            out: &value.out,
+            target_config: value.target_config.clone(),
+            out: value.out.clone(),
             patch_binaries_for_nix: value.patch_binaries_for_nix,
             exec_ctx: &value.exec_ctx,
             stage0_metadata: &value.stage0_metadata,
@@ -582,13 +582,13 @@ pub(crate) fn maybe_download_rustfmt<'a>(
     );
 
     if should_fix_bins_and_dylibs(dwn_ctx.patch_binaries_for_nix, dwn_ctx.exec_ctx) {
-        fix_bin_or_dylib(dwn_ctx.out, &bin_root.join("bin").join("rustfmt"), dwn_ctx.exec_ctx);
-        fix_bin_or_dylib(dwn_ctx.out, &bin_root.join("bin").join("cargo-fmt"), dwn_ctx.exec_ctx);
+        fix_bin_or_dylib(&dwn_ctx.out, &bin_root.join("bin").join("rustfmt"), dwn_ctx.exec_ctx);
+        fix_bin_or_dylib(&dwn_ctx.out, &bin_root.join("bin").join("cargo-fmt"), dwn_ctx.exec_ctx);
         let lib_dir = bin_root.join("lib");
         for lib in t!(fs::read_dir(&lib_dir), lib_dir.display().to_string()) {
             let lib = t!(lib);
             if path_is_dylib(&lib.path()) {
-                fix_bin_or_dylib(dwn_ctx.out, &lib.path(), dwn_ctx.exec_ctx);
+                fix_bin_or_dylib(&dwn_ctx.out, &lib.path(), dwn_ctx.exec_ctx);
             }
         }
     }
@@ -654,18 +654,18 @@ fn download_toolchain<'a>(
         }
 
         if should_fix_bins_and_dylibs(dwn_ctx.patch_binaries_for_nix, dwn_ctx.exec_ctx) {
-            fix_bin_or_dylib(dwn_ctx.out, &bin_root.join("bin").join("rustc"), dwn_ctx.exec_ctx);
-            fix_bin_or_dylib(dwn_ctx.out, &bin_root.join("bin").join("rustdoc"), dwn_ctx.exec_ctx);
+            fix_bin_or_dylib(&dwn_ctx.out, &bin_root.join("bin").join("rustc"), dwn_ctx.exec_ctx);
+            fix_bin_or_dylib(&dwn_ctx.out, &bin_root.join("bin").join("rustdoc"), dwn_ctx.exec_ctx);
             fix_bin_or_dylib(
-                dwn_ctx.out,
+                &dwn_ctx.out,
                 &bin_root.join("libexec").join("rust-analyzer-proc-macro-srv"),
                 dwn_ctx.exec_ctx,
             );
             let lib_dir = bin_root.join("lib");
             for lib in t!(fs::read_dir(&lib_dir), lib_dir.display().to_string()) {
                 let lib = t!(lib);
                 if path_is_dylib(&lib.path()) {
-                    fix_bin_or_dylib(dwn_ctx.out, &lib.path(), dwn_ctx.exec_ctx);
+                    fix_bin_or_dylib(&dwn_ctx.out, &lib.path(), dwn_ctx.exec_ctx);
                 }
             }
         }
@@ -1002,7 +1002,7 @@ fn download_file<'a>(
         println!("download {url}");
     });
     // Use a temporary file in case we crash while downloading, to avoid a corrupt download in cache/.
-    let tempfile = tempdir(dwn_ctx.out).join(dest_path.file_name().unwrap());
+    let tempfile = tempdir(&dwn_ctx.out).join(dest_path.file_name().unwrap());
     // While bootstrap itself only supports http and https downloads, downstream forks might
     // need to download components from other protocols. The match allows them adding more
     // protocols without worrying about merge conflicts if we change the HTTP implementation.