From ff0d6093d227f9aa03ab171b157c88ef0e0ad8e1 Mon Sep 17 00:00:00 2001 From: Ross Sullivan Date: Thu, 15 Jan 2026 23:33:20 +0900 Subject: [PATCH] fix: Moved build-script bins to deps directory --- src/cargo/core/compiler/layout.rs | 4 ++-- tests/testsuite/build_dir.rs | 16 ++++++++-------- tests/testsuite/clean_new_layout.rs | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/cargo/core/compiler/layout.rs b/src/cargo/core/compiler/layout.rs index 3448bd4ed01..664c273a6c5 100644 --- a/src/cargo/core/compiler/layout.rs +++ b/src/cargo/core/compiler/layout.rs @@ -369,7 +369,7 @@ impl BuildDirLayout { /// Fetch the build script path. pub fn build_script(&self, pkg_dir: &str) -> PathBuf { if self.is_new_layout { - self.build_unit(pkg_dir).join("build-script") + self.deps(pkg_dir) } else { self.build().join(pkg_dir) } @@ -377,7 +377,7 @@ impl BuildDirLayout { /// Fetch the build script execution path. pub fn build_script_execution(&self, pkg_dir: &str) -> PathBuf { if self.is_new_layout { - self.build_unit(pkg_dir).join("build-script-execution") + self.build_unit(pkg_dir).join("build-script") } else { self.build().join(pkg_dir) } diff --git a/tests/testsuite/build_dir.rs b/tests/testsuite/build_dir.rs index 7cd385e0bb2..edd02a8ca8d 100644 --- a/tests/testsuite/build_dir.rs +++ b/tests/testsuite/build_dir.rs @@ -292,14 +292,14 @@ fn build_script_should_output_to_build_dir() { [ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/dep-build-script-build-script-build [ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/build-script-build-script-build [ROOT]/foo/build-dir/debug/build/foo/[HASH]/fingerprint/build-script-build-script-build.json -[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/build_script_build[..].d -[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/build_script_build[..][EXE] -[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/build-script-build[EXE] -[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script-execution/out/foo.txt -[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script-execution/invoked.timestamp -[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script-execution/output -[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script-execution/root-output -[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script-execution/stderr +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/build_script_build[..].d +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/build_script_build[..][EXE] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/deps/build-script-build[EXE] +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/out/foo.txt +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/invoked.timestamp +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/output +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/root-output +[ROOT]/foo/build-dir/debug/build/foo/[HASH]/build-script/stderr [ROOT]/foo/build-dir/debug/build/foo/[HASH]/.lock [ROOT]/foo/build-dir/debug/build/foo/[HASH]/.lock [ROOT]/foo/build-dir/debug/build/foo/[HASH]/.lock diff --git a/tests/testsuite/clean_new_layout.rs b/tests/testsuite/clean_new_layout.rs index 597438b70f9..fe3609807d9 100644 --- a/tests/testsuite/clean_new_layout.rs +++ b/tests/testsuite/clean_new_layout.rs @@ -401,7 +401,7 @@ fn build_script() { .with_stderr_data(str![[r#" [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc [..] build.rs [..]` -[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/build-script/build-script-build` +[RUNNING] `[ROOT]/foo/target/debug/build/foo/[HASH]/deps/build-script-build` [RUNNING] `rustc [..] src/main.rs [..]` [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s