Merge branch 'main' into configurable-more-annotations

bazelbuild · Oct 5, 2023 · dd035d8 · dd035d8
2 parents 8b0af0f + f6bba6e
commit dd035d8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/cargo/private/cargo_build_script.bzl b/cargo/private/cargo_build_script.bzl
@@ -256,6 +256,7 @@ def _cargo_build_script_impl(ctx):
         mnemonic = "CargoBuildScriptRun",
         progress_message = "Running Cargo build script {}".format(pkg_name),
         env = env,
+        toolchain = None,
     )
 
     return [

diff --git a/rust/private/clippy.bzl b/rust/private/clippy.bzl
@@ -178,6 +178,7 @@ See https://github.com/bazelbuild/rules_rust/pull/1264#discussion_r853241339 for
         tools = [toolchain.clippy_driver],
         arguments = args.all,
         mnemonic = "Clippy",
+        toolchain = "@rules_rust//rust:toolchain_type",
     )
 
     return [

diff --git a/rust/private/rustc.bzl b/rust/private/rustc.bzl
@@ -1268,6 +1268,7 @@ def rustc_compile_action(
                 formatted_version,
                 len(crate_info.srcs.to_list()),
             ),
+            toolchain = "@rules_rust//rust:toolchain_type",
         )
         if args_metadata:
             ctx.actions.run(
@@ -1283,6 +1284,7 @@ def rustc_compile_action(
                     formatted_version,
                     len(crate_info.srcs.to_list()),
                 ),
+                toolchain = "@rules_rust//rust:toolchain_type",
             )
     else:
         # Run without process_wrapper
@@ -1301,6 +1303,7 @@ def rustc_compile_action(
                 formatted_version,
                 len(crate_info.srcs.to_list()),
             ),
+            toolchain = "@rules_rust//rust:toolchain_type",
         )
 
     if experimental_use_cc_common_link: