Merge remote-tracking branch 'origin/main' into dont_register_rust_ho…

…st_tools_twice
bazelbuild · Jan 20, 2025 · 726b23d · 726b23d
2 parents 839458d + aae84e9
commit 726b23d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -585,6 +585,7 @@ tasks:
     working_directory: test/aliased_toolchains
     build_targets:
       - "@rust_toolchains//:all"
+      - "//..."
   android_examples_ubuntu2004:
     name: Android Examples
     platform: ubuntu2004

diff --git a/rust/repositories.bzl b/rust/repositories.bzl
@@ -269,7 +269,7 @@ def rust_register_toolchains(
             sha256s = sha256s,
             urls = urls,
             versions = versions,
-            aliases = aliases,
+            aliases = dict(aliases),
         )
 
         for toolchain in _get_toolchain_repositories(

diff --git a/test/aliased_toolchains/BUILD.bazel b/test/aliased_toolchains/BUILD.bazel
@@ -0,0 +1,6 @@
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+rust_library(
+    name = "hello",
+    srcs = ["hello.rs"],
+)
diff --git a/test/aliased_toolchains/hello.rs b/test/aliased_toolchains/hello.rs
@@ -0,0 +1 @@
+pub fn hello() {}
diff --git a/test/empty_suite/BUILD.bazel b/test/empty_suite/BUILD.bazel
@@ -2,7 +2,7 @@ load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load("//rust:defs.bzl", "rust_library", "rust_test", "rust_test_suite")
 
 # This package has a rust_test_suite containing no tests.
-# (This could happen if the srcs were seleceted via a glob).
+# (This could happen if the srcs were selected via a glob).
 #
 # We test that the test suite exists and is empty, bypassing test_suite's
 # special-case behavior for empty suites.