Added bzlmod support to rust-analyzer tests

bazelbuild · Dec 19, 2024 · a3778c5 · a3778c5
1 parent 0e2fbbf
commit a3778c5
Show file tree

Hide file tree

Showing 25 changed files with 140 additions and 107 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -69,11 +69,11 @@ use_repo(
     "buildkite_config",
     "generated_inputs_in_external_repo",
     "libc",
+    "rtra",
+    "rtra__serde-1.0.216",
+    "rtra__serde_json-1.0.133",
     "rules_rust_test_load_arbitrary_tool",
     "rules_rust_toolchain_test_target_json",
-    "t3p",
-    "t3p__serde-1.0.215",
-    "t3p__serde_json-1.0.133",
 )
 
 bazel_dep(

diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -49,14 +49,3 @@ http_archive(
 #
 # load("@bazel_ci_rules//:rbe_repo.bzl", "rbe_preconfig")
 # rbe_preconfig(name = "buildkite_config", toolchain = "ubuntu2004-bazel-java11")
-
-http_archive(
-    name = "rules_testing",
-    sha256 = "02c62574631876a4e3b02a1820cb51167bb9cdcdea2381b2fa9d9b8b11c407c4",
-    strip_prefix = "rules_testing-0.6.0",
-    url = "https://github.com/bazelbuild/rules_testing/releases/download/v0.6.0/rules_testing-v0.6.0.tar.gz",
-)
-
-load("//test/3rdparty/crates:crates.bzl", test_crate_repositories = "crate_repositories")
-
-test_crate_repositories()
diff --git a/test/deps.bzl b/test/deps.bzl
@@ -4,6 +4,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 load("//test/generated_inputs:external_repo.bzl", "generated_inputs_in_external_repo")
 load("//test/load_arbitrary_tool:load_arbitrary_tool_test.bzl", "load_arbitrary_tool_test")
+load("//test/rust_analyzer/3rdparty/crates:crates.bzl", rust_analyzer_test_crate_repositories = "crate_repositories")
 load("//test/unit/toolchain:toolchain_test_utils.bzl", "rules_rust_toolchain_test_target_json_repository")
 
 _LIBC_BUILD_FILE_CONTENT = """\
@@ -38,6 +39,7 @@ def rules_rust_test_deps(is_bzlmod = False):
 
     direct_deps = load_arbitrary_tool_test()
     direct_deps.extend(generated_inputs_in_external_repo())
+    direct_deps.extend(rust_analyzer_test_crate_repositories())
 
     maybe(
         http_archive,

diff --git a/test/3rdparty/BUILD.bazel → test/rust_analyzer/3rdparty/BUILD.bazel b/test/3rdparty/BUILD.bazel → test/rust_analyzer/3rdparty/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//crate_universe:defs.bzl", "crate", "crates_vendor")
+load("@rules_rust//crate_universe:defs.bzl", "crate", "crates_vendor")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -14,10 +14,10 @@ crates_vendor(
             version = "1",
         ),
     },
-    # Short for 'test 3rdparty'. Keep this short to reduce the risk to
-    # bump into absolute path length issues on Windows. See:
+    # Short for 'rust_test_rust_analyzer'. Keep this short to reduce
+    # the risk to bump into absolute path length issues on Windows. See:
     # https://github.com/bazelbuild/rules_rust/issues/1120
-    repository_name = "t3p",
+    repository_name = "rtra",
     tags = ["manual"],
     vendor_path = "crates",
 )
diff --git a/test/3rdparty/crates/BUILD.bazel → ...rust_analyzer/3rdparty/crates/BUILD.bazel b/test/3rdparty/crates/BUILD.bazel → ...rust_analyzer/3rdparty/crates/BUILD.bazel
@@ -3,7 +3,7 @@
 # DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
 # regenerate this file, run the following:
 #
-#     bazel run @@//test/3rdparty:crates_vendor
+#     bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
 ###############################################################################
 
 package(default_visibility = ["//visibility:public"])
@@ -33,12 +33,12 @@ filegroup(
 # Workspace Member Dependencies
 alias(
     name = "serde",
-    actual = "@t3p__serde-1.0.215//:serde",
+    actual = "@rtra__serde-1.0.216//:serde",
     tags = ["manual"],
 )
 
 alias(
     name = "serde_json",
-    actual = "@t3p__serde_json-1.0.133//:serde_json",
+    actual = "@rtra__serde_json-1.0.133//:serde_json",
     tags = ["manual"],
 )
diff --git a/test/3rdparty/crates/BUILD.itoa-1.0.14.bazel → ...r/3rdparty/crates/BUILD.itoa-1.0.14.bazel b/test/3rdparty/crates/BUILD.itoa-1.0.14.bazel → ...r/3rdparty/crates/BUILD.itoa-1.0.14.bazel
@@ -3,7 +3,7 @@
 # DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
 # regenerate this file, run the following:
 #
-#     bazel run @@//test/3rdparty:crates_vendor
+#     bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
 ###############################################################################
 
 load("@rules_rust//rust:defs.bzl", "rust_library")

diff --git a/.../3rdparty/crates/BUILD.memchr-2.7.4.bazel → .../3rdparty/crates/BUILD.memchr-2.7.4.bazel b/.../3rdparty/crates/BUILD.memchr-2.7.4.bazel → .../3rdparty/crates/BUILD.memchr-2.7.4.bazel
@@ -3,7 +3,7 @@
 # DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
 # regenerate this file, run the following:
 #
-#     bazel run @@//test/3rdparty:crates_vendor
+#     bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
 ###############################################################################
 
 load("@rules_rust//rust:defs.bzl", "rust_library")

diff --git a/...rty/crates/BUILD.proc-macro2-1.0.92.bazel → ...rty/crates/BUILD.proc-macro2-1.0.92.bazel b/...rty/crates/BUILD.proc-macro2-1.0.92.bazel → ...rty/crates/BUILD.proc-macro2-1.0.92.bazel
@@ -3,7 +3,7 @@
 # DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
 # regenerate this file, run the following:
 #
-#     bazel run @@//test/3rdparty:crates_vendor
+#     bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
 ###############################################################################
 
 load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
@@ -83,8 +83,8 @@ rust_library(
     }),
     version = "1.0.92",
     deps = [
-        "@t3p__proc-macro2-1.0.92//:build_script_build",
-        "@t3p__unicode-ident-1.0.14//:unicode_ident",
+        "@rtra__proc-macro2-1.0.92//:build_script_build",
+        "@rtra__unicode-ident-1.0.14//:unicode_ident",
     ],
 )
 

diff --git a/.../3rdparty/crates/BUILD.quote-1.0.37.bazel → .../3rdparty/crates/BUILD.quote-1.0.37.bazel b/.../3rdparty/crates/BUILD.quote-1.0.37.bazel → .../3rdparty/crates/BUILD.quote-1.0.37.bazel
@@ -3,7 +3,7 @@
 # DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
 # regenerate this file, run the following:
 #
-#     bazel run @@//test/3rdparty:crates_vendor
+#     bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
 ###############################################################################
 
 load("@rules_rust//rust:defs.bzl", "rust_library")
@@ -82,6 +82,6 @@ rust_library(
     }),
     version = "1.0.37",
     deps = [
-        "@t3p__proc-macro2-1.0.92//:proc_macro2",
+        "@rtra__proc-macro2-1.0.92//:proc_macro2",
     ],
 )
diff --git a/test/3rdparty/crates/BUILD.ryu-1.0.18.bazel → ...er/3rdparty/crates/BUILD.ryu-1.0.18.bazel b/test/3rdparty/crates/BUILD.ryu-1.0.18.bazel → ...er/3rdparty/crates/BUILD.ryu-1.0.18.bazel
@@ -3,7 +3,7 @@
 # DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
 # regenerate this file, run the following:
 #
-#     bazel run @@//test/3rdparty:crates_vendor
+#     bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
 ###############################################################################
 
 load("@rules_rust//rust:defs.bzl", "rust_library")

diff --git a/...3rdparty/crates/BUILD.serde-1.0.215.bazel → ...3rdparty/crates/BUILD.serde-1.0.216.bazel b/...3rdparty/crates/BUILD.serde-1.0.215.bazel → ...3rdparty/crates/BUILD.serde-1.0.216.bazel
@@ -3,7 +3,7 @@
 # DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
 # regenerate this file, run the following:
 #
-#     bazel run @@//test/3rdparty:crates_vendor
+#     bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
 ###############################################################################
 
 load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
@@ -38,7 +38,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2018",
     proc_macro_deps = [
-        "@t3p__serde_derive-1.0.215//:serde_derive",
+        "@rtra__serde_derive-1.0.216//:serde_derive",
     ],
     rustc_flags = [
         "--cap-lints=allow",
@@ -87,9 +87,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-none": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.215",
+    version = "1.0.216",
     deps = [
-        "@t3p__serde-1.0.215//:build_script_build",
+        "@rtra__serde-1.0.216//:build_script_build",
     ],
 )
 
@@ -144,7 +144,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.0.215",
+    version = "1.0.216",
     visibility = ["//visibility:private"],
 )
 

diff --git a/...y/crates/BUILD.serde_derive-1.0.215.bazel → ...y/crates/BUILD.serde_derive-1.0.216.bazel b/...y/crates/BUILD.serde_derive-1.0.215.bazel → ...y/crates/BUILD.serde_derive-1.0.216.bazel
@@ -3,7 +3,7 @@
 # DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
 # regenerate this file, run the following:
 #
-#     bazel run @@//test/3rdparty:crates_vendor
+#     bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
 ###############################################################################
 
 load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
@@ -80,10 +80,10 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-none": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.215",
+    version = "1.0.216",
     deps = [
-        "@t3p__proc-macro2-1.0.92//:proc_macro2",
-        "@t3p__quote-1.0.37//:quote",
-        "@t3p__syn-2.0.90//:syn",
+        "@rtra__proc-macro2-1.0.92//:proc_macro2",
+        "@rtra__quote-1.0.37//:quote",
+        "@rtra__syn-2.0.90//:syn",
     ],
 )
diff --git a/...rty/crates/BUILD.serde_json-1.0.133.bazel → ...rty/crates/BUILD.serde_json-1.0.133.bazel b/...rty/crates/BUILD.serde_json-1.0.133.bazel → ...rty/crates/BUILD.serde_json-1.0.133.bazel
@@ -3,7 +3,7 @@
 # DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
 # regenerate this file, run the following:
 #
-#     bazel run @@//test/3rdparty:crates_vendor
+#     bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
 ###############################################################################
 
 load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
@@ -84,11 +84,11 @@ rust_library(
     }),
     version = "1.0.133",
     deps = [
-        "@t3p__itoa-1.0.14//:itoa",
-        "@t3p__memchr-2.7.4//:memchr",
-        "@t3p__ryu-1.0.18//:ryu",
-        "@t3p__serde-1.0.215//:serde",
-        "@t3p__serde_json-1.0.133//:build_script_build",
+        "@rtra__itoa-1.0.14//:itoa",
+        "@rtra__memchr-2.7.4//:memchr",
+        "@rtra__ryu-1.0.18//:ryu",
+        "@rtra__serde-1.0.216//:serde",
+        "@rtra__serde_json-1.0.133//:build_script_build",
     ],
 )
 

diff --git a/test/3rdparty/crates/BUILD.syn-2.0.90.bazel → ...er/3rdparty/crates/BUILD.syn-2.0.90.bazel b/test/3rdparty/crates/BUILD.syn-2.0.90.bazel → ...er/3rdparty/crates/BUILD.syn-2.0.90.bazel
@@ -3,7 +3,7 @@
 # DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
 # regenerate this file, run the following:
 #
-#     bazel run @@//test/3rdparty:crates_vendor
+#     bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
 ###############################################################################
 
 load("@rules_rust//rust:defs.bzl", "rust_library")
@@ -86,8 +86,8 @@ rust_library(
     }),
     version = "2.0.90",
     deps = [
-        "@t3p__proc-macro2-1.0.92//:proc_macro2",
-        "@t3p__quote-1.0.37//:quote",
-        "@t3p__unicode-ident-1.0.14//:unicode_ident",
+        "@rtra__proc-macro2-1.0.92//:proc_macro2",
+        "@rtra__quote-1.0.37//:quote",
+        "@rtra__unicode-ident-1.0.14//:unicode_ident",
     ],
 )
diff --git a/...y/crates/BUILD.unicode-ident-1.0.14.bazel → ...y/crates/BUILD.unicode-ident-1.0.14.bazel b/...y/crates/BUILD.unicode-ident-1.0.14.bazel → ...y/crates/BUILD.unicode-ident-1.0.14.bazel
@@ -3,7 +3,7 @@
 # DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
 # regenerate this file, run the following:
 #
-#     bazel run @@//test/3rdparty:crates_vendor
+#     bazel run @@//test/rust_analyzer/3rdparty:crates_vendor
 ###############################################################################
 
 load("@rules_rust//rust:defs.bzl", "rust_library")

diff --git a/test/3rdparty/crates/alias_rules.bzl → ..._analyzer/3rdparty/crates/alias_rules.bzl b/test/3rdparty/crates/alias_rules.bzl → ..._analyzer/3rdparty/crates/alias_rules.bzl
diff --git a/test/3rdparty/crates/crates.bzl → .../rust_analyzer/3rdparty/crates/crates.bzl b/test/3rdparty/crates/crates.bzl → .../rust_analyzer/3rdparty/crates/crates.bzl
@@ -12,7 +12,7 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 load("@rules_rust//crate_universe/private:crates_vendor.bzl", "crates_vendor_remote_repository")
 
 # buildifier: disable=bzl-visibility
-load("//test/3rdparty/crates:defs.bzl", _crate_repositories = "crate_repositories")
+load("//test/rust_analyzer/3rdparty/crates:defs.bzl", _crate_repositories = "crate_repositories")
 
 def crate_repositories():
     """Generates repositories for vendored crates.
@@ -22,11 +22,11 @@ def crate_repositories():
     """
     maybe(
         crates_vendor_remote_repository,
-        name = "t3p",
-        build_file = Label("//test/3rdparty/crates:BUILD.bazel"),
-        defs_module = Label("//test/3rdparty/crates:defs.bzl"),
+        name = "rtra",
+        build_file = Label("//test/rust_analyzer/3rdparty/crates:BUILD.bazel"),
+        defs_module = Label("//test/rust_analyzer/3rdparty/crates:defs.bzl"),
     )
 
-    direct_deps = [struct(repo = "t3p", is_dev_dep = False)]
+    direct_deps = [struct(repo = "rtra", is_dev_dep = False)]
     direct_deps.extend(_crate_repositories())
     return direct_deps