Moved @rules_rust//tools/runfiles to @rules_rust//rust/runfiles

Author: UebelAndre

.bazelci/presubmit.yml

@@ -72,7 +72,7 @@ default_windows_no_runfiles_targets: &default_windows_no_runfiles_targets
   - "-//test/test_env:test_run"
   - "-//test/unit/pipelined_compilation/..."
   - "-//test/unit/rustdoc/..."
-  - "-//tools/runfiles/..."
+  - "-//rust/runfiles/..."
   # Runfiles used by the test only.
   - "-//test/empty_suite:deps_test"
 crate_universe_vendor_example_targets: &crate_universe_vendor_example_targets
@@ -293,7 +293,7 @@ tasks:
       - "--enable_bzlmod"
     build_targets:
       - "//crate_universe:cargo_bazel_bin"
-      - "//tools/runfiles"
+      - "//rust/runfiles"
       - "//util/import"
   ubuntu2004_clang:
     name: With Clang

crate_universe/BUILD.bazel

@@ -110,7 +110,7 @@ rust_test(
         "RUSTC": "$(rootpath @rules_rust//rust/toolchain:current_rustc_files)",
     },
     deps = [
-        "@rules_rust//tools/runfiles",
+        "@rules_rust//rust/runfiles",
     ] + all_crate_deps(
         normal_dev = True,
     ),
@@ -138,7 +138,7 @@ rust_test(
     tags = ["requires-network"],
     deps = [
         ":cargo_bazel",
-        "@rules_rust//tools/runfiles",
+        "@rules_rust//rust/runfiles",
     ] + all_crate_deps(
         normal = True,
     ),

examples/sys/basic/BUILD.bazel

@@ -32,6 +32,6 @@ rust_test(
     edition = "2021",
     rustc_env = {"HELLO_SYS_RLOCATIONPATH": "$(rlocationpath :hello_sys)"},
     deps = [
-        "@rules_rust//tools/runfiles",
+        "@rules_rust//rust/runfiles",
     ],
 )

extensions/mdbook/private/BUILD.bazel

@@ -15,8 +15,8 @@ rust_binary(
     edition = "2021",
     visibility = ["//visibility:public"],
     deps = [
+        "@rules_rust//rust/runfiles",
         "@rules_rust//tools/action_args",
-        "@rules_rust//tools/runfiles",
     ],
 )
 

extensions/mdbook/test/generated_srcs/BUILD.bazel

@@ -31,5 +31,5 @@ rust_test(
     data = [":generated_srcs"],
     edition = "2021",
     rustc_env = {"MDBOOK_OUTPUT_RLOCATIONPATH": "$(rlocationpath :generated_srcs)"},
-    deps = ["@rules_rust//tools/runfiles"],
+    deps = ["@rules_rust//rust/runfiles"],
 )

rust/runfiles/BUILD.bazel

@@ -0,0 +1,24 @@
+load(
+    "//rust:defs.bzl",
+    "rust_doc",
+    "rust_library",
+    "rust_test",
+)
+
+rust_library(
+    name = "runfiles",
+    srcs = ["runfiles.rs"],
+    edition = "2018",
+    visibility = ["//visibility:public"],
+)
+
+rust_test(
+    name = "runfiles_test",
+    crate = ":runfiles",
+    data = ["data/sample.txt"],
+)
+
+rust_doc(
+    name = "runfiles_doc",
+    crate = ":runfiles",
+)

tools/runfiles/data/sample.txt renamed to rust/runfiles/data/sample.txt

@@ -8,7 +8,7 @@
 //!       name = "my_binary",
 //!       ...
 //!       data = ["//path/to/my/data.txt"],
-//!       deps = ["@rules_rust//tools/runfiles"],
+//!       deps = ["@rules_rust//rust/runfiles"],
 //!   )
 //! ```
 //!
@@ -351,8 +351,8 @@ mod test {
         let r = Runfiles::create().unwrap();
 
         let d = rlocation!(r, "rules_rust").unwrap();
-        let f = rlocation!(r, "rules_rust/tools/runfiles/data/sample.txt").unwrap();
-        assert_eq!(d.join("tools/runfiles/data/sample.txt"), f);
+        let f = rlocation!(r, "rules_rust/rust/runfiles/data/sample.txt").unwrap();
+        assert_eq!(d.join("rust/runfiles/data/sample.txt"), f);
 
         let mut f = File::open(f).unwrap();
 
@@ -373,8 +373,8 @@ mod test {
         env::remove_var(MANIFEST_FILE_ENV_VAR);
         let r = Runfiles::create().unwrap();
 
-        let mut f = File::open(rlocation!(r, "rules_rust/tools/runfiles/data/sample.txt").unwrap())
-            .unwrap();
+        let mut f =
+            File::open(rlocation!(r, "rules_rust/rust/runfiles/data/sample.txt").unwrap()).unwrap();
 
         let mut buffer = String::new();
         f.read_to_string(&mut buffer).unwrap();
@@ -399,8 +399,8 @@ mod test {
 
         let r = Runfiles::create().unwrap();
 
-        let mut f = File::open(rlocation!(r, "rules_rust/tools/runfiles/data/sample.txt").unwrap())
-            .unwrap();
+        let mut f =
+            File::open(rlocation!(r, "rules_rust/rust/runfiles/data/sample.txt").unwrap()).unwrap();
 
         let mut buffer = String::new();
         f.read_to_string(&mut buffer).unwrap();

tools/runfiles/runfiles.rs renamed to rust/runfiles/runfiles.rs

@@ -24,7 +24,7 @@ def bzl_ext_version_test(name, module_bazel, **kwargs):
             "MODULE_BAZEL": "$(rlocationpath {})".format(module_bazel),
         },
         deps = [
-            Label("//tools/runfiles"),
+            Label("//rust/runfiles"),
         ],
         **kwargs
     )

test/bzl_version/bzl_ext_version_test.bzl

@@ -24,7 +24,7 @@ def bzl_version_test(name, module_bazel, **kwargs):
             "VERSION": VERSION,
         },
         deps = [
-            Label("//tools/runfiles"),
+            Label("//rust/runfiles"),
         ],
         **kwargs
     )