Pass File objects for PathMapper compatibility

MODULE.bazel

@@ -9,6 +9,7 @@ module(
 ## Core
 ###############################################################################
 
+bazel_dep(name = "bazel_lib", version = "3.0.0")
 bazel_dep(name = "bazel_features", version = "1.32.0")
 bazel_dep(name = "bazel_skylib", version = "1.8.2")
 bazel_dep(name = "platforms", version = "1.0.0")

cargo/private/BUILD.bazel

@@ -1,5 +1,5 @@
+load("@bazel_lib//lib:copy_file.bzl", "copy_file")
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
 load("//rust:defs.bzl", "rust_binary")
 
 rust_binary(
@@ -39,6 +39,9 @@ copy_file(
 
 bzl_library(
     name = "bzl_lib",
+    deps = [
+        "//rust:bzl_lib",
+    ],
     srcs = glob(["**/*.bzl"]),
-    visibility = ["//:__subpackages__"],
+    visibility = ["//visibility:public"],
 )

extensions/prost/private/BUILD.bazel

@@ -5,6 +5,8 @@ load("//:defs.bzl", "rust_prost_toolchain")
 load(":legacy_proto_toolchain.bzl", "legacy_proto_toolchain")
 load(":prost.bzl", "RUST_EDITION", "current_prost_runtime")
 
+exports_files(["protoc_wrapper.rs"])
+
 current_prost_runtime(
     name = "current_prost_runtime",
 )

extensions/prost/private/prost.bzl

@@ -31,14 +31,14 @@ RUST_EDITION = "2021"
 
 TOOLCHAIN_TYPE = "@rules_rust_prost//:toolchain_type"
 
-def _create_proto_lang_toolchain(ctx, prost_toolchain):
+def _create_proto_lang_toolchain(prost_toolchain):
     proto_lang_toolchain = proto_common.ProtoLangToolchainInfo(
         out_replacement_format_flag = "--prost_out=%s",
         plugin_format_flag = prost_toolchain.prost_plugin_flag,
         plugin = prost_toolchain.prost_plugin[DefaultInfo].files_to_run,
         runtime = prost_toolchain.prost_runtime,
         provided_proto_sources = depset(),
-        proto_compiler = ctx.attr._prost_process_wrapper[DefaultInfo].files_to_run,
+        proto_compiler = prost_toolchain.prost_process_wrapper[DefaultInfo].files_to_run,
         protoc_opts = prost_toolchain.protoc_opts,
         progress_message = "ProstGenProto %{label}",
         mnemonic = "ProstGenProto",
@@ -118,7 +118,7 @@ def _compile_proto(
         additional_inputs = additional_inputs,
         additional_args = additional_args,
         generated_files = [lib_rs, package_info_file],
-        proto_lang_toolchain_info = _create_proto_lang_toolchain(ctx, prost_toolchain),
+        proto_lang_toolchain_info = _create_proto_lang_toolchain(prost_toolchain),
         plugin_output = ctx.bin_dir.path,
     )
 
@@ -377,12 +377,6 @@ rust_prost_aspect = aspect(
             default = Label("@bazel_tools//tools/cpp:grep-includes"),
             cfg = "exec",
         ),
-        "_prost_process_wrapper": attr.label(
-            doc = "The wrapper script for the Prost protoc plugin.",
-            cfg = "exec",
-            executable = True,
-            default = Label("//private:protoc_wrapper"),
-        ),
     } | RUSTC_ATTRS | {
         # Need to override this attribute to explicitly set the workspace.
         "_always_enable_metadata_output_groups": attr.label(
@@ -473,6 +467,7 @@ def _rust_prost_toolchain_impl(ctx):
         prost_plugin = ctx.attr.prost_plugin,
         prost_plugin_flag = ctx.attr.prost_plugin_flag,
         prost_runtime = ctx.attr.prost_runtime,
+        prost_process_wrapper = ctx.attr._prost_process_wrapper,
         prost_types = ctx.attr.prost_types,
         proto_compiler = proto_compiler,
         protoc_opts = ctx.fragments.proto.experimental_protoc_opts,
@@ -516,6 +511,12 @@ rust_prost_toolchain = rule(
             mandatory = True,
             aspects = [rust_analyzer_aspect],
         ),
+        "_prost_process_wrapper": attr.label(
+            doc = "The wrapper script for the Prost protoc plugin.",
+            cfg = "exec",
+            executable = True,
+            default = Label("@rules_rust_prost//private:protoc_wrapper"),
+        ),
         "prost_types": attr.label(
             doc = "The Prost types crates to use.",
             providers = [[rust_common.crate_info], [rust_common.crate_group_info]],

extensions/wasm_bindgen/private/wasm_bindgen_test.bzl

@@ -13,6 +13,7 @@ load(
     "@rules_rust//rust/private:utils.bzl",
     "determine_output_hash",
     "expand_dict_value_locations",
+    "filter_deps",
     "find_toolchain",
     "generate_output_diagnostics",
     "get_import_macro_deps",
@@ -64,8 +65,10 @@ def _rust_wasm_bindgen_test_impl(ctx):
     toolchain = find_toolchain(ctx)
 
     crate_type = "bin"
-    deps = transform_deps(ctx.attr.deps + [wb_toolchain.wasm_bindgen_test])
-    proc_macro_deps = transform_deps(ctx.attr.proc_macro_deps + get_import_macro_deps(ctx))
+
+    deps, proc_macro_deps = filter_deps(ctx)
+    deps = transform_deps(deps + [wb_toolchain.wasm_bindgen_test])
+    proc_macro_deps = transform_deps(proc_macro_deps + get_import_macro_deps(ctx))
 
     # Target is building the crate in `test` config
     if WasmBindgenTestCrateInfo in ctx.attr.wasm:

rust/defs.bzl

@@ -14,6 +14,7 @@
 
 """Public entry point to all Rust rules and supported APIs."""
 
+load("@bazel_features//:features.bzl", "bazel_features")
 load(
     "//rust:toolchain.bzl",
     _rust_stdlib_filegroup = "rust_stdlib_filegroup",
@@ -78,25 +79,57 @@ load(
     _rust_unpretty_aspect = "rust_unpretty_aspect",
 )
 
-rust_library = _rust_library
+def _rule_wrapper(rule):
+    def _wrapped(name, deps = [], proc_macro_deps = [], **kwargs):
+        rule(
+            name = name,
+            deps = deps + proc_macro_deps,
+            # TODO(zbarsky): This attribute would ideally be called `exec_configured_deps` or similar.
+            proc_macro_deps = deps + proc_macro_deps,
+            **kwargs
+        )
+
+    return _wrapped
+
+def _symbolic_rule_wrapper(rule, macro_fn):
+    def _wrapped(name, visibility, deps, proc_macro_deps, **kwargs):
+        rule(
+            name = name,
+            visibility = visibility,
+            deps = deps + proc_macro_deps,
+            # TODO(zbarsky): This attribute would ideally be called `exec_configured_deps` or similar.
+            proc_macro_deps = deps + proc_macro_deps,
+            **kwargs
+        )
+
+    return macro_fn(
+        implementation = _wrapped,
+        inherit_attrs = rule,
+        attrs = {
+            "deps": attr.label_list(default = []),
+            "proc_macro_deps": attr.label_list(default = []),
+        },
+    )
+
+rust_library = _symbolic_rule_wrapper(_rust_library, bazel_features.globals.macro) if bazel_features.globals.macro else _rule_wrapper(_rust_library)
 # See @rules_rust//rust/private:rust.bzl for a complete description.
 
-rust_static_library = _rust_static_library
+rust_static_library = _rule_wrapper(_rust_static_library)
 # See @rules_rust//rust/private:rust.bzl for a complete description.
 
-rust_shared_library = _rust_shared_library
+rust_shared_library = _rule_wrapper(_rust_shared_library)
 # See @rules_rust//rust/private:rust.bzl for a complete description.
 
-rust_proc_macro = _rust_proc_macro
+rust_proc_macro = _rule_wrapper(_rust_proc_macro)
 # See @rules_rust//rust/private:rust.bzl for a complete description.
 
-rust_binary = _rust_binary
+rust_binary = _symbolic_rule_wrapper(_rust_binary, bazel_features.globals.macro) if bazel_features.globals.macro else _rule_wrapper(_rust_binary)
 # See @rules_rust//rust/private:rust.bzl for a complete description.
 
 rust_library_group = _rust_library_group
 # See @rules_rust//rust/private:rust.bzl for a complete description.
 
-rust_test = _rust_test
+rust_test = _symbolic_rule_wrapper(_rust_test, bazel_features.globals.macro) if bazel_features.globals.macro else _rule_wrapper(_rust_test)
 # See @rules_rust//rust/private:rust.bzl for a complete description.
 
 rust_test_suite = _rust_test_suite
@@ -105,7 +138,7 @@ rust_test_suite = _rust_test_suite
 rust_doc = _rust_doc
 # See @rules_rust//rust/private:rustdoc.bzl for a complete description.
 
-rust_doc_test = _rust_doc_test
+rust_doc_test = _rule_wrapper(_rust_doc_test)
 # See @rules_rust//rust/private:rustdoc_test.bzl for a complete description.
 
 clippy_flag = _clippy_flag

rust/extensions.bzl

@@ -26,8 +26,6 @@ def _find_modules(module_ctx):
             our_module = mod
     if root == None:
         root = our_module
-    if our_module == None:
-        fail("Unable to find rules_rust module")
 
     return root, our_module
 
@@ -93,7 +91,9 @@ def _rust_impl(module_ctx):
         if toolchain_triples.get(repository_set["exec_triple"]) == repository_set["name"]:
             toolchain_triples.pop(repository_set["exec_triple"], None)
 
-    toolchains = root.tags.toolchain or rules_rust.tags.toolchain
+    toolchains = root.tags.toolchain
+    if not toolchains and rules_rust:
+        toolchains = rules_rust.tags.toolchain
 
     for toolchain in toolchains:
         if toolchain.extra_rustc_flags and toolchain.extra_rustc_flags_triples:

rust/platform/BUILD.bazel

@@ -31,5 +31,4 @@ package_group(
 bzl_library(
     name = "bzl_lib",
     srcs = glob(["**/*.bzl"]),
-    visibility = ["//rust:__subpackages__"],
 )

rust/platform/triple_mappings.bzl

@@ -121,8 +121,8 @@ _CPU_ARCH_TO_BUILTIN_PLAT_SUFFIX = {
     "le32": None,
     "mips": None,
     "mipsel": None,
-    "powerpc": "ppc",
-    "powerpc64": None,
+    "powerpc": "ppc32",
+    "powerpc64": "ppc",
     "powerpc64le": "ppc64le",
     "riscv32": "riscv32",
     "riscv32imc": "riscv32",
@@ -154,17 +154,17 @@ _SYSTEM_TO_BUILTIN_SYS_SUFFIX = {
     "linux": "linux",
     "macos": "osx",
     "nacl": None,
-    "netbsd": None,
+    "netbsd": "netbsd",
     "nixos": "nixos",
     "none": "none",
     "nto": "qnx",
     "openbsd": "openbsd",
     "solaris": None,
     "uefi": "uefi",
     "unknown": None,
-    "wasi": None,
-    "wasip1": None,
-    "wasip2": None,
+    "wasi": "wasi",
+    "wasip1": "wasi",
+    "wasip2": "wasi",
     "windows": "windows",
 }
 
@@ -179,6 +179,7 @@ _SYSTEM_TO_BINARY_EXT = {
     "ios": "",
     "linux": "",
     "macos": "",
+    "netbsd": "",
     "nixos": "",
     "none": "",
     "nto": "",
@@ -187,6 +188,7 @@ _SYSTEM_TO_BINARY_EXT = {
     # generated extension for the wasm target, similarly to the
     # windows target
     "unknown": ".wasm",
+    "threads": ".wasm",
     "wasi": ".wasm",
     "wasip1": ".wasm",
     "wasip2": ".wasm",
@@ -204,11 +206,13 @@ _SYSTEM_TO_STATICLIB_EXT = {
     "ios": ".a",
     "linux": ".a",
     "macos": ".a",
+    "netbsd": ".a",
     "nixos": ".a",
     "none": ".a",
     "nto": ".a",
     "uefi": ".lib",
     "unknown": "",
+    "threads": "",
     "wasi": "",
     "wasip1": "",
     "wasip2": "",
@@ -226,11 +230,13 @@ _SYSTEM_TO_DYLIB_EXT = {
     "ios": ".dylib",
     "linux": ".so",
     "macos": ".dylib",
+    "netbsd": ".so",
     "nixos": ".so",
     "none": ".so",
     "nto": ".a",
     "uefi": "",  # UEFI doesn't have dynamic linking
     "unknown": ".wasm",
+    "threads": ".wasm",
     "wasi": ".wasm",
     "wasip1": ".wasm",
     "wasip2": ".wasm",
@@ -284,7 +290,12 @@ _SYSTEM_TO_STDLIB_LINKFLAGS = {
     "wasi": [],
     "wasip1": [],
     "wasip2": [],
-    "windows": ["advapi32.lib", "ws2_32.lib", "userenv.lib", "Bcrypt.lib"],
+    "windows": {
+        # see https://github.com/rust-lang/rust/blob/c4aa646f15e40bd3e64ddb5017b7b89b3646ac99/src/tools/run-make-support/src/external_deps/c_cxx_compiler/extras.rs#L14-L23
+        "gnu": ["-lws2_32", "-luserenv", "-lbcrypt", "-lntdll", "-lsynchronization"],
+        "gnullvm": ["-lws2_32", "-luserenv", "-lbcrypt", "-lntdll", "-lsynchronization"],
+        "msvc": ["advapi32.lib", "ws2_32.lib", "userenv.lib", "Bcrypt.lib"],
+    },
 }
 
 def cpu_arch_to_constraints(cpu_arch, *, system = None, abi = None):
@@ -410,8 +421,11 @@ def system_to_staticlib_ext(system):
 def system_to_binary_ext(system):
     return _SYSTEM_TO_BINARY_EXT[system]
 
-def system_to_stdlib_linkflags(system):
-    return _SYSTEM_TO_STDLIB_LINKFLAGS[system]
+def system_to_stdlib_linkflags(target_triple):
+    val = _SYSTEM_TO_STDLIB_LINKFLAGS[target_triple.system]
+    if type(val) == "list":
+        return val
+    return val[target_triple.abi]
 
 def triple_to_constraint_set(target_triple):
     """Returns a set of constraints for a given platform triple

rust/private/BUILD.bazel

@@ -1,6 +1,7 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("//rust/private:rust_analyzer.bzl", "rust_analyzer_detect_sysroot")
 load("//rust/private:rustc.bzl", "is_proc_macro_dep", "is_proc_macro_dep_enabled")
+load("//rust/private:stamp.bzl", "stamp_build_setting")
 
 # Exported for docs
 exports_files(["providers.bzl"])
@@ -21,7 +22,7 @@ bzl_library(
 bzl_library(
     name = "bzl_lib",
     srcs = glob(["**/*.bzl"]),
-    visibility = ["//rust:__subpackages__"],
+    visibility = ["//visibility:public"],
     deps = [
         ":bazel_tools_bzl_lib",
         ":rules_cc_bzl_lib",
@@ -32,6 +33,8 @@ bzl_library(
     ],
 )
 
+stamp_build_setting(name = "stamp")
+
 # This setting may be used to identify dependencies of proc-macro-s.
 # This feature is only enabled if `is_proc_macro_dep_enabled` is true.
 # Its value controls the BAZEL_RULES_RUST_IS_PROC_MACRO_DEP environment variable

rust/private/clippy.bzl

@@ -165,7 +165,7 @@ def rust_clippy_action(ctx, clippy_executable, process_wrapper, crate_info, conf
         attr = ctx.rule.attr,
         file = ctx.file,
         toolchain = toolchain,
-        tool_path = clippy_executable.path,
+        tool_path = clippy_executable,
         cc_toolchain = cc_toolchain,
         feature_configuration = feature_configuration,
         crate_info = crate_info,

rust/private/repository_utils.bzl

@@ -417,7 +417,7 @@ def BUILD_for_rust_toolchain(
         str: A rendered template of a `rust_toolchain` declaration
     """
     if stdlib_linkflags == None:
-        stdlib_linkflags = ", ".join(['"%s"' % x for x in system_to_stdlib_linkflags(target_triple.system)])
+        stdlib_linkflags = ", ".join(['"%s"' % x for x in system_to_stdlib_linkflags(target_triple)])
 
     rustfmt_label = None
     if include_rustfmt: