refactor: Moved logic to enable new layout to dedicated function

Author: ranger-ross

src/cargo/core/compiler/build_runner/compilation_files.rs

@@ -11,6 +11,7 @@ use tracing::debug;
 
 use super::{BuildContext, BuildRunner, CompileKind, FileFlavor, Layout};
 use crate::core::compiler::{CompileMode, CompileTarget, CrateType, FileType, Unit};
+use crate::core::features::is_new_build_dir_layout_enabled;
 use crate::core::{Target, TargetKind, Workspace};
 use crate::util::{self, CargoResult, OnceExt, StableHasher};
 
@@ -239,7 +240,7 @@ impl<'a, 'gctx: 'a> CompilationFiles<'a, 'gctx> {
     /// Note that some units may share the same directory, so care should be
     /// taken in those cases!
     fn pkg_dir(&self, unit: &Unit) -> String {
-        let separator = match self.ws.gctx().cli_unstable().build_dir_new_layout {
+        let separator = match is_new_build_dir_layout_enabled(self.ws.gctx()) {
             true => "/",
             false => "-",
         };

src/cargo/core/compiler/build_runner/mod.rs

@@ -7,6 +7,7 @@ use std::sync::{Arc, Mutex};
 use crate::core::PackageId;
 use crate::core::compiler::compilation::{self, UnitOutput};
 use crate::core::compiler::{self, Unit, UserIntent, artifact};
+use crate::core::features::is_new_build_dir_layout_enabled;
 use crate::util::cache_lock::CacheLockMode;
 use crate::util::errors::CargoResult;
 use annotate_snippets::{Level, Message};
@@ -413,7 +414,7 @@ impl<'a, 'gctx> BuildRunner<'a, 'gctx> {
                     .root_output
                     .insert(kind, artifact_dir.dest().to_path_buf());
             }
-            if self.bcx.gctx.cli_unstable().build_dir_new_layout {
+            if is_new_build_dir_layout_enabled(self.bcx.gctx) {
                 for (unit, _) in self.bcx.unit_graph.iter() {
                     let dep_dir = self.files().deps_dir(unit);
                     paths::create_dir_all(&dep_dir)?;

src/cargo/core/compiler/layout.rs

@@ -103,6 +103,7 @@
 
 use crate::core::Workspace;
 use crate::core::compiler::CompileTarget;
+use crate::core::features::is_new_build_dir_layout_enabled;
 use crate::util::flock::is_on_nfs_mount;
 use crate::util::{CargoResult, FileLock};
 use cargo_util::paths;
@@ -129,7 +130,7 @@ impl Layout {
         dest: &str,
         must_take_artifact_dir_lock: bool,
     ) -> CargoResult<Layout> {
-        let is_new_layout = ws.gctx().cli_unstable().build_dir_new_layout;
+        let is_new_layout = is_new_build_dir_layout_enabled(ws.gctx());
         let mut root = ws.target_dir();
         let mut build_root = ws.build_dir();
         if let Some(target) = target {

src/cargo/core/compiler/mod.rs

@@ -95,6 +95,7 @@ use self::unit_graph::UnitDep;
 use crate::core::compiler::future_incompat::FutureIncompatReport;
 use crate::core::compiler::timings::SectionTiming;
 pub use crate::core::compiler::unit::{Unit, UnitInterner};
+use crate::core::features::is_new_build_dir_layout_enabled;
 use crate::core::manifest::TargetSourcePath;
 use crate::core::profiles::{PanicStrategy, Profile, StripInner};
 use crate::core::{Feature, PackageId, Target, Verbosity};
@@ -1682,7 +1683,7 @@ fn build_deps_args(
     unit: &Unit,
 ) -> CargoResult<()> {
     let bcx = build_runner.bcx;
-    if build_runner.bcx.gctx.cli_unstable().build_dir_new_layout {
+    if is_new_build_dir_layout_enabled(build_runner.bcx.gctx) {
         let mut map = BTreeMap::new();
 
         // Recursively add all dependency args to rustc process

src/cargo/core/features.rs

@@ -1554,3 +1554,8 @@ pub fn cargo_docs_link(path: &str) -> String {
     };
     format!("https://doc.rust-lang.org/{url_channel}cargo/{path}")
 }
+
+/// Returns true of the new build dir layout is enabeld.
+pub fn is_new_build_dir_layout_enabled(gctx: &GlobalContext) -> bool {
+    gctx.cli_unstable().build_dir_new_layout
+}

src/cargo/ops/cargo_clean.rs

@@ -1,4 +1,5 @@
 use crate::core::compiler::{CompileKind, CompileMode, Layout, RustcTargetData};
+use crate::core::features::is_new_build_dir_layout_enabled;
 use crate::core::profiles::Profiles;
 use crate::core::{PackageIdSpec, PackageIdSpecQuery, TargetKind, Workspace};
 use crate::ops;
@@ -194,7 +195,7 @@ fn clean_specs(
 
     clean_ctx.progress = Box::new(CleaningPackagesBar::new(clean_ctx.gctx, packages.len()));
 
-    if clean_ctx.gctx.cli_unstable().build_dir_new_layout {
+    if is_new_build_dir_layout_enabled(clean_ctx.gctx) {
         for pkg in packages {
             clean_ctx.progress.on_cleaning_package(&pkg.name())?;