remove set and some more refactor

Author: Shourya742

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

@@ -47,7 +47,7 @@ use crate::core::config::toml::rust::{
 use crate::core::config::toml::target::Target;
 use crate::core::config::{
     DebuginfoLevel, DryRun, GccCiMode, LlvmLibunwind, Merge, ReplaceOpt, RustcLto, SplitDebuginfo,
-    StringOrBool, set, threads_from_config,
+    StringOrBool, threads_from_config,
 };
 use crate::core::download::{
     DownloadContext, download_beta_toolchain, is_download_ci_available, maybe_download_rustfmt,
@@ -479,8 +479,6 @@ impl Config {
         // Now load the TOML config, as soon as possible
         let (mut toml, toml_path) = load_toml_config(&src, flags_config, &get_toml);
 
-        let compile_time_deps = flags_compile_time_deps;
-        let cmd = flags_cmd;
         let is_running_on_ci = flags_ci.unwrap_or(CiEnv::is_ci());
 
         postprocess_toml(&mut toml, &src, toml_path.clone(), &exec_ctx, &flags_set, &get_toml);
@@ -654,6 +652,14 @@ impl Config {
 
         let Gcc { download_ci_gcc: gcc_download_ci_gcc } = toml.gcc.unwrap_or_default();
 
+        if rust_optimize_.as_ref().is_some_and(|v| matches!(v, RustOptimize::Bool(false))) {
+            eprintln!(
+                "WARNING: setting `optimize` to `false` is known to cause errors and \
+                should be considered unsupported. Refer to `bootstrap.example.toml` \
+                for more details."
+            );
+        }
+
         // Prefer CLI verbosity flags if set (`flags_verbose` > 0), otherwise take the value from
         // TOML.
         exec_ctx.set_verbosity(cmp::max(build_verbose.unwrap_or_default() as u8, flags_verbose));
@@ -664,14 +670,6 @@ impl Config {
 
         let path_modification_cache = Arc::new(Mutex::new(HashMap::new()));
 
-        if rust_optimize_.as_ref().is_some_and(|v| matches!(v, RustOptimize::Bool(false))) {
-            eprintln!(
-                "WARNING: setting `optimize` to `false` is known to cause errors and \
-                should be considered unsupported. Refer to `bootstrap.example.toml` \
-                for more details."
-            );
-        }
-
         let host_target = flags_build
             .or(build_build)
             .map(|build| TargetSelection::from_user(&build))
@@ -690,7 +688,6 @@ impl Config {
         let mut download_rustc_commit = None;
         let llvm_link_shared = Cell::default();
         let mut llvm_from_ci = false;
-        let mut lld_enabled = false;
         let mut channel = "dev".to_string();
         let mut out = flags_build_dir
             .or(build_build_dir.map(PathBuf::from))
@@ -756,12 +753,10 @@ impl Config {
             is_running_on_ci,
         );
 
-        let initial_rustc = if let Some(rustc) = build_rustc {
-            rustc
-        } else {
+        let initial_rustc = build_rustc.unwrap_or_else(|| {
             download_beta_toolchain(&dwn_ctx);
             out.join(host_target).join("stage0").join("bin").join(exe("rustc", host_target))
-        };
+        });
 
         let initial_sysroot = t!(PathBuf::from_str(
             command(&initial_rustc)
@@ -772,20 +767,15 @@ impl Config {
                 .trim()
         ));
 
-        let initial_cargo_clippy = build_cargo_clippy;
-
-        let initial_cargo = if let Some(cargo) = build_cargo {
-            cargo
-        } else {
-            download_beta_toolchain(&dwn_ctx);
+        let initial_cargo = build_cargo.unwrap_or_else(|| {
+            download_beta_toolchain(&mut dwn_ctx);
             initial_sysroot.join("bin").join(exe("cargo", host_target))
-        };
+        });
 
         // NOTE: it's important this comes *after* we set `initial_rustc` just above.
         if exec_ctx.dry_run() {
-            let dir = out.join("tmp-dry-run");
-            t!(fs::create_dir_all(&dir));
-            out = dir;
+            out = out.join("tmp-dry-run");
+            fs::create_dir_all(&out).expect("Failed to create dry-run directory");
             dwn_ctx.out = out.clone();
         }
 
@@ -809,12 +799,6 @@ impl Config {
         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()
-                && src.join("vendor").exists()
-                && src.join(".cargo/config.toml").exists(),
-        );
-
         if !is_user_configured_rust_channel && rust_info.is_from_tarball() {
             channel = ci_channel.into();
         }
@@ -858,6 +842,23 @@ impl Config {
             dwn_ctx.download_rustc_commit = None;
         }
 
+        // We need to override `rust.channel` if it's manually specified when using the CI rustc.
+        // This is because if the compiler uses a different channel than the one specified in bootstrap.toml,
+        // tests may fail due to using a different channel than the one used by the compiler during tests.
+        if let Some(commit) = &download_rustc_commit
+            && is_user_configured_rust_channel
+        {
+            println!(
+                "WARNING: `rust.download-rustc` is enabled. The `rust.channel` option will be overridden by the CI rustc's channel."
+            );
+
+            let channel_ = read_file_by_commit(&dwn_ctx, Path::new("src/ci/channel"), commit)
+                .trim()
+                .to_owned();
+
+            channel = channel_;
+        }
+
         if let Some(t) = toml.target {
             for (triple, cfg) in t {
                 let mut target = Target::from_triple(&triple);
@@ -932,35 +933,15 @@ impl Config {
         //   thus, disabled
         // - similarly, lld will not be built nor used by default when explicitly asked not to, e.g.
         //   when the config sets `rust.lld = false`
-        if default_lld_opt_in_targets().contains(&host_target.triple.to_string())
+        let lld_enabled = if default_lld_opt_in_targets().contains(&host_target.triple.to_string())
             && hosts == [host_target]
         {
-            let no_llvm_config = target_config
-                .get(&host_target)
-                .is_none_or(|target_config| target_config.llvm_config.is_none());
-            let enable_lld = llvm_from_ci || no_llvm_config;
-            // Prefer the config setting in case an explicit opt-out is needed.
-            lld_enabled = rust_lld_enabled.unwrap_or(enable_lld);
+            let no_llvm_config =
+                target_config.get(&host_target).map_or(true, |config| config.llvm_config.is_none());
+            rust_lld_enabled.unwrap_or(llvm_from_ci || no_llvm_config)
         } else {
-            set(&mut lld_enabled, rust_lld_enabled);
-        }
-
-        // We need to override `rust.channel` if it's manually specified when using the CI rustc.
-        // This is because if the compiler uses a different channel than the one specified in bootstrap.toml,
-        // tests may fail due to using a different channel than the one used by the compiler during tests.
-        if let Some(commit) = &download_rustc_commit
-            && is_user_configured_rust_channel
-        {
-            println!(
-                "WARNING: `rust.download-rustc` is enabled. The `rust.channel` option will be overridden by the CI rustc's channel."
-            );
-
-            let channel_ = read_file_by_commit(&dwn_ctx, Path::new("src/ci/channel"), commit)
-                .trim()
-                .to_owned();
-
-            channel = channel_;
-        }
+            rust_lld_enabled.unwrap_or(false)
+        };
 
         if let Some(v) = llvm_link_shared_ {
             llvm_link_shared.set(Some(v));
@@ -1024,8 +1005,7 @@ impl Config {
             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 { maybe_download_rustfmt(&dwn_ctx) };
+        let initial_rustfmt = build_rustfmt.or_else(|| maybe_download_rustfmt(&dwn_ctx));
 
         if matches!(rust_lld_mode.unwrap_or_default(), LldMode::SelfContained)
             && !lld_enabled
@@ -1042,7 +1022,7 @@ impl Config {
 
         let download_rustc = download_rustc_commit.is_some();
 
-        let stage = match cmd {
+        let stage = match flags_cmd {
             Subcommand::Check { .. } => flags_stage.or(build_check_stage).unwrap_or(1),
             Subcommand::Clippy { .. } | Subcommand::Fix => {
                 flags_stage.or(build_check_stage).unwrap_or(1)
@@ -1071,7 +1051,7 @@ impl Config {
         };
 
         // Now check that the selected stage makes sense, and if not, print a warning and end
-        match (stage, &cmd) {
+        match (stage, &flags_cmd) {
             (0, Subcommand::Build) => {
                 eprintln!("ERROR: cannot build anything on stage 0. Use at least stage 1.");
                 exit!(1);
@@ -1087,7 +1067,7 @@ impl Config {
             _ => {}
         }
 
-        if compile_time_deps && !matches!(cmd, Subcommand::Check { .. }) {
+        if flags_compile_time_deps && !matches!(flags_cmd, Subcommand::Check { .. }) {
             eprintln!(
                 "WARNING: Can't use --compile-time-deps with any subcommand other than check."
             );
@@ -1097,7 +1077,7 @@ impl Config {
         // CI should always run stage 2 builds, unless it specifically states otherwise
         #[cfg(not(test))]
         if flags_stage.is_none() && is_running_on_ci {
-            match cmd {
+            match flags_cmd {
                 Subcommand::Test { .. }
                 | Subcommand::Miri { .. }
                 | Subcommand::Doc { .. }
@@ -1351,21 +1331,25 @@ impl Config {
             llvm_thin_lto: llvm_thin_lto_.unwrap_or(false),
             rustc_debug_assertions: rust_rustc_debug_assertions.unwrap_or(rust_debug == Some(true)),
             lld_mode: rust_lld_mode.unwrap_or_default(),
+            initial_cargo_clippy: build_cargo_clippy,
+            vendor: build_vendor.unwrap_or(
+                rust_info.is_from_tarball()
+                    && src.join("vendor").exists()
+                    && src.join(".cargo/config.toml").exists(),
+            ),
+            cmd: flags_cmd,
             exec_ctx,
             out,
             rust_info,
             initial_cargo,
             initial_rustc,
-            initial_cargo_clippy,
             initial_sysroot,
             initial_rustfmt,
             submodules,
-            vendor,
             target_config,
             omit_git_hash,
             stage,
             src,
-            cmd,
             llvm_from_ci,
             llvm_assertions,
             lld_enabled,

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

@@ -402,12 +402,6 @@ pub enum GccCiMode {
     DownloadFromCi,
 }
 
-pub fn set<T>(field: &mut T, val: Option<T>) {
-    if let Some(v) = val {
-        *field = v;
-    }
-}
-
 pub fn threads_from_config(v: u32) -> u32 {
     match v {
         0 => std::thread::available_parallelism().map_or(1, std::num::NonZeroUsize::get) as u32,