bazelbuild · UebelAndre · Mar 22, 2026 · Feb 27, 2026
diff --git a/test/cargo_build_script/BUILD.bazel → cargo/tests/BUILD.bazel b/test/cargo_build_script/BUILD.bazel → cargo/tests/BUILD.bazel
diff --git a/cargo/tests/build_env/BUILD.bazel b/cargo/tests/build_env/BUILD.bazel
@@ -0,0 +1,24 @@
+load("//cargo:defs.bzl", "cargo_build_script")
+load("//rust:rust_test.bzl", "rust_test")
+
+rust_test(
+    # Intentionally uses a mix of -s and _s because those normalisations are part of what is being tested.
+    name = "cargo_env-vars_test",
+    srcs = ["tests/cargo.rs"],
+    edition = "2018",
+    deps = [":cargo_build_script_env-vars_bs"],
+)
+
+rust_test(
+    name = "cargo-env-vars-custom-crate-name-test",
+    srcs = ["tests/custom_crate_name.rs"],
+    crate_name = "custom_crate_name",
+    edition = "2018",
+    deps = [":cargo_build_script_env-vars_bs"],
+)
+
+cargo_build_script(
+    name = "cargo_build_script_env-vars_bs",
+    srcs = ["src/build.rs"],
+    edition = "2018",
+)
diff --git a/test/build_env/src/build.rs → cargo/tests/build_env/src/build.rs b/test/build_env/src/build.rs → cargo/tests/build_env/src/build.rs
diff --git a/cargo/tests/build_env/src/manifest_dir_file.txt b/cargo/tests/build_env/src/manifest_dir_file.txt
@@ -0,0 +1 @@
+This file tests that CARGO_MANIFEST_DIR is set for the build environment
diff --git a/test/build_env/tests/cargo.rs → cargo/tests/build_env/tests/cargo.rs b/test/build_env/tests/cargo.rs → cargo/tests/build_env/tests/cargo.rs
diff --git a/cargo/tests/build_env/tests/custom_crate_name.rs b/cargo/tests/build_env/tests/custom_crate_name.rs
@@ -0,0 +1,8 @@
+#[test]
+fn cargo_env_vars() {
+    assert_eq!(
+        env!("CARGO_PKG_NAME"),
+        "cargo-env-vars-custom-crate-name-test"
+    );
+    assert_eq!(env!("CARGO_CRATE_NAME"), "custom_crate_name");
+}
diff --git a/cargo/tests/build_env/tests/manifest_dir.rs b/cargo/tests/build_env/tests/manifest_dir.rs
@@ -0,0 +1,10 @@
+#[test]
+pub fn test_manifest_dir() {
+    let actual = include_str!(concat!(
+        env!("CARGO_MANIFEST_DIR"),
+        "/src/manifest_dir_file.txt"
+    ))
+    .trim_end();
+    let expected = "This file tests that CARGO_MANIFEST_DIR is set for the build environment";
+    assert_eq!(actual, expected);
+}
diff --git a/.../cargo_build_script/cc_args_and_env/empty → cargo/tests/cargo_build_script/BUILD.bazel b/.../cargo_build_script/cc_args_and_env/empty → cargo/tests/cargo_build_script/BUILD.bazel
diff --git a/...script/build_script_env_files/BUILD.bazel → ...script/build_script_env_files/BUILD.bazel b/...script/build_script_env_files/BUILD.bazel → ...script/build_script_env_files/BUILD.bazel
diff --git a/...ld_script/build_script_env_files/build.rs → ...ld_script/build_script_env_files/build.rs b/...ld_script/build_script_env_files/build.rs → ...ld_script/build_script_env_files/build.rs
diff --git a/...script/build_script_env_files/test_lib.rs → ...script/build_script_env_files/test_lib.rs b/...script/build_script_env_files/test_lib.rs → ...script/build_script_env_files/test_lib.rs
diff --git a/..._build_script/cc_args_and_env/BUILD.bazel → ..._build_script/cc_args_and_env/BUILD.bazel b/..._build_script/cc_args_and_env/BUILD.bazel → ..._build_script/cc_args_and_env/BUILD.bazel
diff --git a/...rgo_build_script/cc_args_and_env/build.rs → ...rgo_build_script/cc_args_and_env/build.rs b/...rgo_build_script/cc_args_and_env/build.rs → ...rgo_build_script/cc_args_and_env/build.rs
diff --git a/.../cc_args_and_env/cc_args_and_env_test.bzl → .../cc_args_and_env/cc_args_and_env_test.bzl b/.../cc_args_and_env/cc_args_and_env_test.bzl → .../cc_args_and_env/cc_args_and_env_test.bzl
@@ -334,7 +334,7 @@ def cargo_build_script_with_extra_cc_compile_flags(
     )
     with_extra_toolchains(
         name = name,
-        extra_toolchains = ["//test/cargo_build_script/cc_args_and_env:%s/test_cc_toolchain" % name],
+        extra_toolchains = ["//%s:%s/test_cc_toolchain" % (native.package_name(), name)],
         target = "%s/cargo_build_script_impl" % name,
         tags = ["manual"],
     )

diff --git a/cargo/tests/cargo_build_script/cc_args_and_env/empty b/cargo/tests/cargo_build_script/cc_args_and_env/empty
diff --git a/..._build_script/compatible_with/BUILD.bazel → ..._build_script/compatible_with/BUILD.bazel b/..._build_script/compatible_with/BUILD.bazel → ..._build_script/compatible_with/BUILD.bazel
diff --git a/...uild_script/compatible_with/do_nothing.rs → ...uild_script/compatible_with/do_nothing.rs b/...uild_script/compatible_with/do_nothing.rs → ...uild_script/compatible_with/do_nothing.rs
diff --git a/...cargo_build_script/compatible_with/lib.rs → ...cargo_build_script/compatible_with/lib.rs b/...cargo_build_script/compatible_with/lib.rs → ...cargo_build_script/compatible_with/lib.rs
diff --git a/...rgo_build_script/compile_data/BUILD.bazel → ...rgo_build_script/compile_data/BUILD.bazel b/...rgo_build_script/compile_data/BUILD.bazel → ...rgo_build_script/compile_data/BUILD.bazel
diff --git a/.../cargo_build_script/compile_data/build.rs → .../cargo_build_script/compile_data/build.rs b/.../cargo_build_script/compile_data/build.rs → .../cargo_build_script/compile_data/build.rs
diff --git a/.../cargo_build_script/compile_data/data.txt → .../cargo_build_script/compile_data/data.txt b/.../cargo_build_script/compile_data/data.txt → .../cargo_build_script/compile_data/data.txt
diff --git a/test/cargo_build_script/compile_data/test.rs → ...s/cargo_build_script/compile_data/test.rs b/test/cargo_build_script/compile_data/test.rs → ...s/cargo_build_script/compile_data/test.rs
diff --git a/...ild_script/feature_generation/BUILD.bazel → ...ild_script/feature_generation/BUILD.bazel b/...ild_script/feature_generation/BUILD.bazel → ...ild_script/feature_generation/BUILD.bazel
diff --git a/..._build_script/feature_generation/build.rs → ..._build_script/feature_generation/build.rs b/..._build_script/feature_generation/build.rs → ..._build_script/feature_generation/build.rs
diff --git a/...go_build_script/feature_generation/lib.rs → ...go_build_script/feature_generation/lib.rs b/...go_build_script/feature_generation/lib.rs → ...go_build_script/feature_generation/lib.rs
diff --git a/...o_build_script/feature_generation/test.rs → ...o_build_script/feature_generation/test.rs b/...o_build_script/feature_generation/test.rs → ...o_build_script/feature_generation/test.rs
diff --git a/...d_script/feature_generation/transitive.rs → ...d_script/feature_generation/transitive.rs b/...d_script/feature_generation/transitive.rs → ...d_script/feature_generation/transitive.rs
diff --git a/...ipt/feature_generation/transitive_test.rs → ...ipt/feature_generation/transitive_test.rs b/...ipt/feature_generation/transitive_test.rs → ...ipt/feature_generation/transitive_test.rs
diff --git a/...eign_toolchain_make_variables/BUILD.bazel → ...eign_toolchain_make_variables/BUILD.bazel b/...eign_toolchain_make_variables/BUILD.bazel → ...eign_toolchain_make_variables/BUILD.bazel
diff --git a/...foreign_toolchain_make_variables/build.rs → ...foreign_toolchain_make_variables/build.rs b/...foreign_toolchain_make_variables/build.rs → ...foreign_toolchain_make_variables/build.rs
diff --git a/...gn_toolchain_make_variables/toolchain.bzl → ...gn_toolchain_make_variables/toolchain.bzl b/...gn_toolchain_make_variables/toolchain.bzl → ...gn_toolchain_make_variables/toolchain.bzl
diff --git a/...ild_script/location_expansion/BUILD.bazel → ...ild_script/location_expansion/BUILD.bazel b/...ild_script/location_expansion/BUILD.bazel → ...ild_script/location_expansion/BUILD.bazel
diff --git a/..._build_script/location_expansion/build.rs → ..._build_script/location_expansion/build.rs b/..._build_script/location_expansion/build.rs → ..._build_script/location_expansion/build.rs
diff --git a/...o_build_script/location_expansion/test.rs → ...o_build_script/location_expansion/test.rs b/...o_build_script/location_expansion/test.rs → ...o_build_script/location_expansion/test.rs
@@ -1,7 +1,7 @@
 #[test]
 pub fn test_data_rootpath() {
     assert_eq!(
-        "test/cargo_build_script/location_expansion/target_data.txt",
+        "cargo/tests/cargo_build_script/location_expansion/target_data.txt",
         env!("DATA_ROOTPATH")
     );
 }
@@ -11,9 +11,9 @@ pub fn test_data_rlocation() {
     assert!(
         [
             // workspace
-            "rules_rust/test/cargo_build_script/location_expansion/target_data.txt",
+            "rules_rust/cargo/tests/cargo_build_script/location_expansion/target_data.txt",
             // bzlmod
-            "_main/test/cargo_build_script/location_expansion/target_data.txt",
+            "_main/cargo/tests/cargo_build_script/location_expansion/target_data.txt",
         ]
         .contains(&env!("DATA_RLOCATIONPATH")),
         concat!("Unexpected rlocationpath: ", env!("DATA_RLOCATIONPATH"))
@@ -23,7 +23,7 @@ pub fn test_data_rlocation() {
 #[test]
 pub fn test_tool_rootpath() {
     assert_eq!(
-        "test/cargo_build_script/location_expansion/exec_data.txt",
+        "cargo/tests/cargo_build_script/location_expansion/exec_data.txt",
         env!("TOOL_ROOTPATH")
     );
 }
@@ -33,9 +33,9 @@ pub fn test_tool_rlocationpath() {
     assert!(
         [
             // workspace
-            "rules_rust/test/cargo_build_script/location_expansion/exec_data.txt",
+            "rules_rust/cargo/tests/cargo_build_script/location_expansion/exec_data.txt",
             // bzlmod
-            "_main/test/cargo_build_script/location_expansion/exec_data.txt",
+            "_main/cargo/tests/cargo_build_script/location_expansion/exec_data.txt",
         ]
         .contains(&env!("TOOL_RLOCATIONPATH")),
         concat!("Unexpected rlocationpath: ", env!("TOOL_RLOCATIONPATH"))
@@ -83,10 +83,10 @@ pub fn test_execpath() {
 
     assert_eq!(
         data_short_path,
-        "test/cargo_build_script/location_expansion/target_data.txt"
+        "cargo/tests/cargo_build_script/location_expansion/target_data.txt"
     );
     assert_eq!(
         tool_short_path,
-        "test/cargo_build_script/location_expansion/exec_data.txt"
+        "cargo/tests/cargo_build_script/location_expansion/exec_data.txt"
     );
 }
diff --git a/...t/resolve_abs_symlink_out_dir/BUILD.bazel → ...t/resolve_abs_symlink_out_dir/BUILD.bazel b/...t/resolve_abs_symlink_out_dir/BUILD.bazel → ...t/resolve_abs_symlink_out_dir/BUILD.bazel
diff --git a/...ript/resolve_abs_symlink_out_dir/build.rs → ...ript/resolve_abs_symlink_out_dir/build.rs b/...ript/resolve_abs_symlink_out_dir/build.rs → ...ript/resolve_abs_symlink_out_dir/build.rs
diff --git a/...ript/resolve_abs_symlink_out_dir/data.txt → ...ript/resolve_abs_symlink_out_dir/data.txt b/...ript/resolve_abs_symlink_out_dir/data.txt → ...ript/resolve_abs_symlink_out_dir/data.txt
diff --git a/...cript/resolve_abs_symlink_out_dir/test.rs → ...cript/resolve_abs_symlink_out_dir/test.rs b/...cript/resolve_abs_symlink_out_dir/test.rs → ...cript/resolve_abs_symlink_out_dir/test.rs
diff --git a/...ild_script/run_from_exec_root/BUILD.bazel → ...ild_script/run_from_exec_root/BUILD.bazel b/...ild_script/run_from_exec_root/BUILD.bazel → ...ild_script/run_from_exec_root/BUILD.bazel
diff --git a/..._build_script/run_from_exec_root/build.rs → ..._build_script/run_from_exec_root/build.rs b/..._build_script/run_from_exec_root/build.rs → ..._build_script/run_from_exec_root/build.rs
@@ -1,5 +1,5 @@
 fn main() {
-    let contents = std::fs::read_to_string("test/cargo_build_script/run_from_exec_root/data.txt")
+    let contents = std::fs::read_to_string("cargo/tests/cargo_build_script/run_from_exec_root/data.txt")
         .expect("Failed to read data file");
     println!("cargo:rustc-env=DATA={}", contents);
 }
diff --git a/..._build_script/run_from_exec_root/data.txt → ..._build_script/run_from_exec_root/data.txt b/..._build_script/run_from_exec_root/data.txt → ..._build_script/run_from_exec_root/data.txt
diff --git a/...o_build_script/run_from_exec_root/test.rs → ...o_build_script/run_from_exec_root/test.rs b/...o_build_script/run_from_exec_root/test.rs → ...o_build_script/run_from_exec_root/test.rs
diff --git a/..._build_script/rustc_env_files/BUILD.bazel → ..._build_script/rustc_env_files/BUILD.bazel b/..._build_script/rustc_env_files/BUILD.bazel → ..._build_script/rustc_env_files/BUILD.bazel
diff --git a/...rgo_build_script/rustc_env_files/build.rs → ...rgo_build_script/rustc_env_files/build.rs b/...rgo_build_script/rustc_env_files/build.rs → ...rgo_build_script/rustc_env_files/build.rs
diff --git a/..._build_script/rustc_env_files/test_lib.rs → ..._build_script/rustc_env_files/test_lib.rs b/..._build_script/rustc_env_files/test_lib.rs → ..._build_script/rustc_env_files/test_lib.rs
diff --git a/...uild_script/symlink_exec_root/BUILD.bazel → ...uild_script/symlink_exec_root/BUILD.bazel b/...uild_script/symlink_exec_root/BUILD.bazel → ...uild_script/symlink_exec_root/BUILD.bazel
diff --git a/...xec_root/symlink_exec_root_transition.bzl → ...xec_root/symlink_exec_root_transition.bzl b/...xec_root/symlink_exec_root_transition.bzl → ...xec_root/symlink_exec_root_transition.bzl
diff --git a/..._exec_root/test_exec_root_access.build.rs → ..._exec_root/test_exec_root_access.build.rs b/..._exec_root/test_exec_root_access.build.rs → ..._exec_root/test_exec_root_access.build.rs
diff --git a/...cargo_build_script/tools_exec/BUILD.bazel → ...cargo_build_script/tools_exec/BUILD.bazel b/...cargo_build_script/tools_exec/BUILD.bazel → ...cargo_build_script/tools_exec/BUILD.bazel
diff --git a/test/cargo_build_script/tools_exec/build.rs → ...ts/cargo_build_script/tools_exec/build.rs b/test/cargo_build_script/tools_exec/build.rs → ...ts/cargo_build_script/tools_exec/build.rs
diff --git a/...rgo_build_script/tools_exec/tools_exec.rs → ...rgo_build_script/tools_exec/tools_exec.rs b/...rgo_build_script/tools_exec/tools_exec.rs → ...rgo_build_script/tools_exec/tools_exec.rs
diff --git a/test/dep_env/BUILD.bazel → cargo/tests/dep_env/BUILD.bazel b/test/dep_env/BUILD.bazel → cargo/tests/dep_env/BUILD.bazel
diff --git a/test/dep_env/dep_env.bzl → cargo/tests/dep_env/dep_env.bzl b/test/dep_env/dep_env.bzl → cargo/tests/dep_env/dep_env.bzl
diff --git a/test/dep_env/empty.rs → cargo/tests/dep_env/empty.rs b/test/dep_env/empty.rs → cargo/tests/dep_env/empty.rs
diff --git a/test/dep_env/read_a.rs → cargo/tests/dep_env/read_a.rs b/test/dep_env/read_a.rs → cargo/tests/dep_env/read_a.rs
diff --git a/test/dep_env/read_b.rs → cargo/tests/dep_env/read_b.rs b/test/dep_env/read_b.rs → cargo/tests/dep_env/read_b.rs
diff --git a/test/dep_env/read_c.rs → cargo/tests/dep_env/read_c.rs b/test/dep_env/read_c.rs → cargo/tests/dep_env/read_c.rs
diff --git a/test/dep_env/read_dep_dir.rs → cargo/tests/dep_env/read_dep_dir.rs b/test/dep_env/read_dep_dir.rs → cargo/tests/dep_env/read_dep_dir.rs
diff --git a/test/dep_env/set_a.rs → cargo/tests/dep_env/set_a.rs b/test/dep_env/set_a.rs → cargo/tests/dep_env/set_a.rs
diff --git a/test/dep_env/set_b.env → cargo/tests/dep_env/set_b.env b/test/dep_env/set_b.env → cargo/tests/dep_env/set_b.env
diff --git a/test/dep_env/set_c.rs → cargo/tests/dep_env/set_c.rs b/test/dep_env/set_c.rs → cargo/tests/dep_env/set_c.rs
diff --git a/test/out_dir_in_tests/BUILD.bazel → cargo/tests/out_dir_in_tests/BUILD.bazel b/test/out_dir_in_tests/BUILD.bazel → cargo/tests/out_dir_in_tests/BUILD.bazel
diff --git a/test/out_dir_in_tests/build.rs → cargo/tests/out_dir_in_tests/build.rs b/test/out_dir_in_tests/build.rs → cargo/tests/out_dir_in_tests/build.rs
diff --git a/test/out_dir_in_tests/src/lib.rs → cargo/tests/out_dir_in_tests/src/lib.rs b/test/out_dir_in_tests/src/lib.rs → cargo/tests/out_dir_in_tests/src/lib.rs
diff --git a/.../out_dir_in_tests/tests/out_dir_reader.rs → .../out_dir_in_tests/tests/out_dir_reader.rs b/.../out_dir_in_tests/tests/out_dir_reader.rs → .../out_dir_in_tests/tests/out_dir_reader.rs
diff --git a/test/transitive_lib/BUILD.bazel → cargo/tests/transitive_lib/BUILD.bazel b/test/transitive_lib/BUILD.bazel → cargo/tests/transitive_lib/BUILD.bazel
diff --git a/test/transitive_lib/build.rs → cargo/tests/transitive_lib/build.rs b/test/transitive_lib/build.rs → cargo/tests/transitive_lib/build.rs
diff --git a/test/transitive_lib/dll_user.rs → cargo/tests/transitive_lib/dll_user.rs b/test/transitive_lib/dll_user.rs → cargo/tests/transitive_lib/dll_user.rs
diff --git a/test/transitive_lib/dll_user_user.rs → cargo/tests/transitive_lib/dll_user_user.rs b/test/transitive_lib/dll_user_user.rs → cargo/tests/transitive_lib/dll_user_user.rs
diff --git a/cargo/tests/unit/BUILD.bazel b/cargo/tests/unit/BUILD.bazel
diff --git a/test/unit/build_script_deps/BUILD.bazel → .../tests/unit/build_script_deps/BUILD.bazel b/test/unit/build_script_deps/BUILD.bazel → .../tests/unit/build_script_deps/BUILD.bazel
diff --git a/test/unit/build_script_deps/build.rs → cargo/tests/unit/build_script_deps/build.rs b/test/unit/build_script_deps/build.rs → cargo/tests/unit/build_script_deps/build.rs
diff --git a/...t/build_script_deps/build_script_deps.bzl → ...t/build_script_deps/build_script_deps.bzl b/...t/build_script_deps/build_script_deps.bzl → ...t/build_script_deps/build_script_deps.bzl
diff --git a/test/unit/build_script_deps/lib.rs → cargo/tests/unit/build_script_deps/lib.rs b/test/unit/build_script_deps/lib.rs → cargo/tests/unit/build_script_deps/lib.rs
diff --git a/.../transitive_link_search_paths/BUILD.bazel → .../transitive_link_search_paths/BUILD.bazel b/.../transitive_link_search_paths/BUILD.bazel → .../transitive_link_search_paths/BUILD.bazel
diff --git a/.../unit/transitive_link_search_paths/bin.rs → .../unit/transitive_link_search_paths/bin.rs b/.../unit/transitive_link_search_paths/bin.rs → .../unit/transitive_link_search_paths/bin.rs
diff --git a/.../unit/transitive_link_search_paths/dep.rs → .../unit/transitive_link_search_paths/dep.rs b/.../unit/transitive_link_search_paths/dep.rs → .../unit/transitive_link_search_paths/dep.rs
diff --git a/...transitive_link_search_paths/dep_build.rs → ...transitive_link_search_paths/dep_build.rs b/...transitive_link_search_paths/dep_build.rs → ...transitive_link_search_paths/dep_build.rs
diff --git a/...ransitive_link_search_paths/proc_macro.rs → ...ransitive_link_search_paths/proc_macro.rs b/...ransitive_link_search_paths/proc_macro.rs → ...ransitive_link_search_paths/proc_macro.rs
diff --git a/...ive_link_search_paths/proc_macro_build.rs → ...ive_link_search_paths/proc_macro_build.rs b/...ive_link_search_paths/proc_macro_build.rs → ...ive_link_search_paths/proc_macro_build.rs
diff --git a/...ths/transitive_link_search_paths_test.bzl → ...ths/transitive_link_search_paths_test.bzl b/...ths/transitive_link_search_paths_test.bzl → ...ths/transitive_link_search_paths_test.bzl
diff --git a/test/build_env/BUILD.bazel b/test/build_env/BUILD.bazel
@@ -1,11 +1,5 @@
-load(
-    "//cargo:defs.bzl",
-    "cargo_build_script",
-)
 load("//rust:defs.bzl", "rust_library", "rust_test")
 
-package(default_visibility = ["//visibility:public"])
-
 rust_test(
     name = "conflicting_deps_test",
     srcs = ["tests/manifest_dir.rs"],
@@ -54,25 +48,3 @@ rust_test(
         "USER_DEFINED_KEY": "USER_DEFINED_VALUE",
     },
 )
-
-rust_test(
-    # Intentionally uses a mix of -s and _s because those normalisations are part of what is being tested.
-    name = "cargo_env-vars_test",
-    srcs = ["tests/cargo.rs"],
-    edition = "2018",
-    deps = [":cargo_build_script_env-vars_bs"],
-)
-
-rust_test(
-    name = "cargo-env-vars-custom-crate-name-test",
-    srcs = ["tests/custom_crate_name.rs"],
-    crate_name = "custom_crate_name",
-    edition = "2018",
-    deps = [":cargo_build_script_env-vars_bs"],
-)
-
-cargo_build_script(
-    name = "cargo_build_script_env-vars_bs",
-    srcs = ["src/build.rs"],
-    edition = "2018",
-)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		This file tests that CARGO_MANIFEST_DIR is set for the build environment