Merge branch 'main' into ci

Author: UebelAndre

cargo/cargo_build_script.bzl

@@ -92,7 +92,7 @@ def _build_script_impl(ctx):
     # Pull in env vars which may be required for the cc_toolchain to work (e.g. on OSX, the SDK version).
     # We hope that the linker env is sufficient for the whole cc_toolchain.
     cc_toolchain, feature_configuration = find_cc_toolchain(ctx)
-    _, _, linker_env = get_linker_and_args(ctx, cc_toolchain, feature_configuration, None)
+    _, _, linker_env = get_linker_and_args(ctx, ctx.attr, cc_toolchain, feature_configuration, None)
     env.update(**linker_env)
 
     # MSVC requires INCLUDE to be set

proto/proto.bzl

@@ -220,6 +220,7 @@ def _rust_proto_compile(protos, descriptor_sets, imports, crate_name, ctx, is_gr
 
     return rustc_compile_action(
         ctx = ctx,
+        attr = ctx.attr,
         toolchain = find_toolchain(ctx),
         crate_info = rust_common.create_crate_info(
             name = crate_name,

rust/defs.bzl

@@ -33,7 +33,6 @@ load(
     _rust_shared_library = "rust_shared_library",
     _rust_static_library = "rust_static_library",
     _rust_test = "rust_test",
-    _rust_test_binary = "rust_test_binary",
     _rust_test_suite = "rust_test_suite",
 )
 load(
@@ -77,9 +76,6 @@ rust_binary = _rust_binary
 rust_test = _rust_test
 # See @rules_rust//rust/private:rust.bzl for a complete description.
 
-rust_test_binary = _rust_test_binary
-# See @rules_rust//rust/private:rust.bzl for a complete description.
-
 rust_test_suite = _rust_test_suite
 # See @rules_rust//rust/private:rust.bzl for a complete description.
 

rust/private/clippy.bzl

@@ -80,15 +80,15 @@ def _clippy_aspect_impl(target, ctx):
     clippy_marker = ctx.actions.declare_file(ctx.label.name + ".clippy.ok")
 
     args, env = construct_arguments(
-        ctx,
-        ctx.rule.attr,
-        ctx.file,
-        toolchain,
-        toolchain.clippy_driver.path,
-        cc_toolchain,
-        feature_configuration,
-        crate_info,
-        dep_info,
+        ctx = ctx,
+        attr = ctx.rule.attr,
+        file = ctx.file,
+        toolchain = toolchain,
+        tool_path = toolchain.clippy_driver.path,
+        cc_toolchain = cc_toolchain,
+        feature_configuration = feature_configuration,
+        crate_info = crate_info,
+        dep_info = dep_info,
         output_hash = determine_output_hash(crate_info.root),
         rust_flags = [],
         out_dir = out_dir,

rust/private/rust.bzl

@@ -252,6 +252,7 @@ def _rust_library_common(ctx, crate_type):
 
     return rustc_compile_action(
         ctx = ctx,
+        attr = ctx.attr,
         toolchain = toolchain,
         crate_info = rust_common.create_crate_info(
             name = crate_name,
@@ -287,6 +288,7 @@ def _rust_binary_impl(ctx):
 
     return rustc_compile_action(
         ctx = ctx,
+        attr = ctx.attr,
         toolchain = toolchain,
         crate_info = rust_common.create_crate_info(
             name = crate_name,
@@ -447,6 +449,7 @@ def _rust_test_common(ctx, toolchain, output):
 
     providers = rustc_compile_action(
         ctx = ctx,
+        attr = ctx.attr,
         toolchain = toolchain,
         crate_info = crate_info,
         rust_flags = ["--test"] if ctx.attr.use_libtest_harness else ["--cfg", "test"],
@@ -1127,32 +1130,6 @@ rust_test = rule(
 """),
 )
 
-rust_test_binary = rule(
-    implementation = _rust_test_impl,
-    provides = _common_providers,
-    attrs = dict(_common_attrs.items() +
-                 _rust_test_attrs.items()),
-    executable = True,
-    fragments = ["cpp"],
-    host_fragments = ["cpp"],
-    toolchains = [
-        str(Label("//rust:toolchain")),
-        "@bazel_tools//tools/cpp:toolchain_type",
-    ],
-    incompatible_use_toolchain_transition = True,
-    doc = dedent("""\
-        Builds a Rust test binary, without marking this rule as a Bazel test.
-
-        **Warning**: This rule is currently experimental.
-
-        This should be used when you want to run the test binary from a different test
-        rule (such as [`sh_test`](https://docs.bazel.build/versions/master/be/shell.html#sh_test)),
-        and know that running the test binary directly will fail.
-
-        See `rust_test` for example usage.
-        """),
-)
-
 def rust_test_suite(name, srcs, **kwargs):
     """A rule for creating a test suite for a set of `rust_test` targets.
 

rust/private/rustc.bzl

@@ -185,15 +185,17 @@ def get_cc_user_link_flags(ctx):
     """
     return ctx.fragments.cpp.linkopts
 
-def get_linker_and_args(ctx, cc_toolchain, feature_configuration, rpaths):
+def get_linker_and_args(ctx, attr, cc_toolchain, feature_configuration, rpaths):
     """Gathers cc_common linker information
 
     Args:
         ctx (ctx): The current target's context object
+        attr (struct): Attributes to use in gathering linker args
         cc_toolchain (CcToolchain): cc_toolchain for which we are creating build variables.
         feature_configuration (FeatureConfiguration): Feature configuration to be queried.
         rpaths (depset): Depset of directories where loader will look for libraries at runtime.
 
+
     Returns:
         tuple: A tuple of the following items:
             - (str): The tool path for given action.
@@ -204,7 +206,7 @@ def get_linker_and_args(ctx, cc_toolchain, feature_configuration, rpaths):
 
     # Add linkopt's from dependencies. This includes linkopts from transitive
     # dependencies since they get merged up.
-    for dep in ctx.attr.deps:
+    for dep in getattr(attr, "deps", []):
         if CcInfo in dep and dep[CcInfo].linking_context:
             for linker_input in dep[CcInfo].linking_context.linker_inputs.to_list():
                 for flag in linker_input.user_link_flags:
@@ -482,7 +484,7 @@ def construct_arguments(
         # linker since it won't understand.
         if toolchain.target_arch != "wasm32":
             rpaths = _compute_rpaths(toolchain, output_dir, dep_info)
-            ld, link_args, link_env = get_linker_and_args(ctx, cc_toolchain, feature_configuration, rpaths)
+            ld, link_args, link_env = get_linker_and_args(ctx, attr, cc_toolchain, feature_configuration, rpaths)
             env.update(link_env)
             rustc_flags.add("--codegen=linker=" + ld)
             rustc_flags.add_joined("--codegen", link_args, join_with = " ", format_joined = "link-args=%s")
@@ -528,6 +530,7 @@ def construct_arguments(
 
 def rustc_compile_action(
         ctx,
+        attr,
         toolchain,
         crate_info,
         output_hash = None,
@@ -537,6 +540,7 @@ def rustc_compile_action(
 
     Args:
         ctx (ctx): The rule's context object
+        attr (struct): Attributes to use for the rust compile action
         toolchain (rust_toolchain): The current `rust_toolchain`
         crate_info (CrateInfo): The CrateInfo provider for the current target.
         output_hash (str, optional): The hashed path of the crate root. Defaults to None.
@@ -559,35 +563,35 @@ def rustc_compile_action(
     )
 
     compile_inputs, out_dir, build_env_files, build_flags_files = collect_inputs(
-        ctx,
-        ctx.file,
-        ctx.files,
-        toolchain,
-        cc_toolchain,
-        crate_info,
-        dep_info,
-        build_info,
+        ctx = ctx,
+        file = ctx.file,
+        files = ctx.files,
+        toolchain = toolchain,
+        cc_toolchain = cc_toolchain,
+        crate_info = crate_info,
+        dep_info = dep_info,
+        build_info = build_info,
     )
 
     args, env = construct_arguments(
-        ctx,
-        ctx.attr,
-        ctx.file,
-        toolchain,
-        toolchain.rustc.path,
-        cc_toolchain,
-        feature_configuration,
-        crate_info,
-        dep_info,
-        output_hash,
-        rust_flags,
-        out_dir,
-        build_env_files,
-        build_flags_files,
+        ctx = ctx,
+        attr = attr,
+        file = ctx.file,
+        toolchain = toolchain,
+        tool_path = toolchain.rustc.path,
+        cc_toolchain = cc_toolchain,
+        feature_configuration = feature_configuration,
+        crate_info = crate_info,
+        dep_info = dep_info,
+        output_hash = output_hash,
+        rust_flags = rust_flags,
+        out_dir = out_dir,
+        build_env_files = build_env_files,
+        build_flags_files = build_flags_files,
     )
 
-    if hasattr(ctx.attr, "version") and ctx.attr.version != "0.0.0":
-        formatted_version = " v{}".format(ctx.attr.version)
+    if hasattr(attr, "version") and attr.version != "0.0.0":
+        formatted_version = " v{}".format(attr.version)
     else:
         formatted_version = ""
 
@@ -613,9 +617,9 @@ def rustc_compile_action(
         collect_data = True,
     )
 
-    out_binary = False
-    if hasattr(ctx.attr, "out_binary"):
-        out_binary = getattr(ctx.attr, "out_binary")
+    # TODO: Remove after some resolution to
+    # https://github.com/bazelbuild/rules_rust/issues/771
+    out_binary = getattr(attr, "out_binary", False)
 
     providers = [
         crate_info,
@@ -628,18 +632,19 @@ def rustc_compile_action(
         ),
     ]
     if toolchain.target_arch != "wasm32":
-        providers += establish_cc_info(ctx, crate_info, toolchain, cc_toolchain, feature_configuration)
+        providers += establish_cc_info(ctx, attr, crate_info, toolchain, cc_toolchain, feature_configuration)
 
     return providers
 
 def _is_dylib(dep):
     return not bool(dep.static_library or dep.pic_static_library)
 
-def establish_cc_info(ctx, crate_info, toolchain, cc_toolchain, feature_configuration):
+def establish_cc_info(ctx, attr, crate_info, toolchain, cc_toolchain, feature_configuration):
     """If the produced crate is suitable yield a CcInfo to allow for interop with cc rules
 
     Args:
         ctx (ctx): The rule's context object
+        attr (struct): Attributes to use in gathering CcInfo
         crate_info (CrateInfo): The CrateInfo provider of the target crate
         toolchain (rust_toolchain): The current `rust_toolchain`
         cc_toolchain (CcToolchainInfo): The current `CcToolchainInfo`
@@ -649,7 +654,17 @@ def establish_cc_info(ctx, crate_info, toolchain, cc_toolchain, feature_configur
         list: A list containing the CcInfo provider
     """
 
-    if crate_info.is_test or crate_info.type not in ("staticlib", "cdylib", "rlib", "lib") or getattr(ctx.attr, "out_binary", False):
+    # A test will not need to produce CcInfo as nothing can depend on test targets
+    if crate_info.is_test:
+        return []
+
+    # Only generate CcInfo for particular crate types
+    if crate_info.type not in ("staticlib", "cdylib", "rlib", "lib"):
+        return []
+
+    # TODO: Remove after some resolution to
+    # https://github.com/bazelbuild/rules_rust/issues/771
+    if getattr(attr, "out_binary", False):
         return []
 
     if crate_info.type == "staticlib":
@@ -698,7 +713,7 @@ def establish_cc_info(ctx, crate_info, toolchain, cc_toolchain, feature_configur
     )
 
     cc_infos = [CcInfo(linking_context = linking_context)]
-    for dep in ctx.attr.deps:
+    for dep in getattr(attr, "deps", []):
         if CcInfo in dep:
             cc_infos.append(dep[CcInfo])
 

rust/rust.bzl

@@ -31,7 +31,6 @@ load(
     _rust_shared_library = "rust_shared_library",
     _rust_static_library = "rust_static_library",
     _rust_test = "rust_test",
-    _rust_test_binary = "rust_test_binary",
 )
 load("//rust/settings:incompatible.bzl", "fail_when_enabled")
 
@@ -70,9 +69,6 @@ rust_binary = _rust_binary
 rust_test = _rust_test
 # See @rules_rust//rust/private:rust.bzl for a complete description.
 
-rust_test_binary = _rust_test_binary
-# See @rules_rust//rust/private:rust.bzl for a complete description.
-
 rust_benchmark = _rust_benchmark
 # See @rules_rust//rust/private:rust.bzl for a complete description.
 

test/rust_test_binary/BUILD.bazel

@@ -1,8 +1,12 @@
 load("//rust:defs.bzl", "rust_binary", "rust_clippy", "rust_library")
+load(":rustfmt_utils.bzl", "aspect_repository")
 
 package(default_visibility = ["//visibility:public"])
 
-exports_files(["rustfmt.toml"])
+exports_files([
+    "rustfmt.toml",
+    "rustfmt_utils.bzl",
+])
 
 rust_library(
     name = "rustfmt_lib",
@@ -30,6 +34,9 @@ rust_binary(
         "//:rustfmt.toml",
     ],
     edition = "2018",
+    rustc_env = {
+        "ASPECT_REPOSITORY": aspect_repository(),
+    },
     deps = [
         ":rustfmt_lib",
         "//util/label",