fix(check): Do not uplift files to artifact-dir for check builds

Author: ranger-ross

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

@@ -455,18 +455,13 @@ impl<'a, 'gctx: 'a> CompilationFiles<'a, 'gctx> {
         let uplift_path = if unit.target.is_example() {
             // Examples live in their own little world.
             self.layout(unit.kind)
-                .artifact_dir()
-                .expect("artifact-dir was not locked")
+                .artifact_dir()?
                 .examples()
                 .join(filename)
         } else if unit.target.is_custom_build() {
             self.build_script_dir(unit).join(filename)
         } else {
-            self.layout(unit.kind)
-                .artifact_dir()
-                .expect("artifact-dir was not locked")
-                .dest()
-                .join(filename)
+            self.layout(unit.kind).artifact_dir()?.dest().join(filename)
         };
         if from_path == uplift_path {
             // This can happen with things like examples that reside in the

tests/testsuite/check.rs

@@ -1720,9 +1720,8 @@ fn check_build_should_not_lock_artifact_dir() {
 }
 
 // Regression test for #16305
-#[should_panic]
 #[cargo_test]
-fn check_build_should_uplift_proc_macro_dylib_deps() {
+fn check_build_should_not_uplift_proc_macro_dylib_deps() {
     let p = project()
         .file(
             ".cargo/config.toml",
@@ -1802,4 +1801,11 @@ fn check_build_should_uplift_proc_macro_dylib_deps() {
         .build();
 
     p.cargo("check").enable_mac_dsym().run();
+
+    p.root()
+        .join("target-dir")
+        .assert_build_dir_layout(str![[r#"
+[ROOT]/foo/target-dir/CACHEDIR.TAG
+
+"#]]);
 }