Merge branch 'main' into cargo-build-cflags

Author: illicitonion

.bazelci/presubmit.yml

@@ -302,5 +302,9 @@ tasks:
     # TODO: fix test targets in `crate_universe_windows_targets`
     test_targets: *crate_universe_windows_targets
 buildifier:
-  version: latest
+  # TODO: Version 5.0.0 introduced a ton of unused variable warnings in cases
+  # that should have been accounted for by `_` prefixes on the variable. Buildifier
+  # should ignore `_` prefixed variables when checking if something is unused
+  # https://github.com/bazelbuild/buildtools/issues/1044
+  version: 4.2.5
   warnings: "all"

cargo/cargo_bootstrap.bzl

@@ -188,7 +188,6 @@ def _cargo_bootstrap_repository_impl(repository_ctx):
         rustc_template = repository_ctx.attr.rust_toolchain_rustc_template
 
     tools = get_rust_tools(
-        repository_ctx = repository_ctx,
         cargo_template = cargo_template,
         rustc_template = rustc_template,
         host_triple = host_triple,

cargo/private/cargo_utils.bzl

@@ -151,11 +151,10 @@ def _resolve_repository_template(
 
     return template
 
-def get_rust_tools(repository_ctx, cargo_template, rustc_template, host_triple, version):
+def get_rust_tools(cargo_template, rustc_template, host_triple, version):
     """Retrieve `cargo` and `rustc` labels based on the host triple.
 
     Args:
-        repository_ctx (repository_ctx): The rule's context object
         cargo_template (str): A template used to identify the label of the host `cargo` binary.
         rustc_template (str): A template used to identify the label of the host `rustc` binary.
         host_triple (struct): The host's triple. See `@rules_rust//rust/platform:triple.bzl`.

crate_universe/defs.bzl

@@ -377,7 +377,7 @@ def _override(
             if not type(dep_val) == "dict":
                 fail("The {} attribute should be a dictionary".format(dep_key))
 
-            for target, deps in dep_val.items():
+            for deps in dep_val.values():
                 if not type(deps) == "list" or any([type(x) != "string" for x in deps]):
                     fail("The {} values should be lists of strings".format(dep_key))
 

crate_universe/private/util.bzl

@@ -123,7 +123,7 @@ def get_cargo_and_rustc(repository_ctx, host_triple):
         version_str = repository_ctx.attr.version
 
     # Get info about the current host's tool locations
-    (host_triple, resolver_triple) = get_host_triple(repository_ctx)
+    host_triple, _ = get_host_triple(repository_ctx)
     system = triple_to_system(host_triple)
     extension = system_to_binary_ext(system)
     arch = triple_to_arch(host_triple)

crate_universe/src/templates/partials/build_script.template

@@ -51,6 +51,7 @@ cargo_build_script(
     {%- include "templates/partials/targeted_build_script_data_dependencies.template" -%},
     {%- else -%},
     {%- endif %}
+    aliases = {%- include "templates/partials/targeted_aliases.template" %},
     tags = [
         "cargo-raze",
         "manual",

docs/flatten.md

@@ -1110,9 +1110,9 @@ Run the test with `bazel build //hello_lib:hello_lib_test`.
 
 <pre>
 rust_toolchain(<a href="#rust_toolchain-name">name</a>, <a href="#rust_toolchain-allocator_library">allocator_library</a>, <a href="#rust_toolchain-binary_ext">binary_ext</a>, <a href="#rust_toolchain-cargo">cargo</a>, <a href="#rust_toolchain-clippy_driver">clippy_driver</a>, <a href="#rust_toolchain-debug_info">debug_info</a>,
-               <a href="#rust_toolchain-default_edition">default_edition</a>, <a href="#rust_toolchain-dylib_ext">dylib_ext</a>, <a href="#rust_toolchain-exec_triple">exec_triple</a>, <a href="#rust_toolchain-opt_level">opt_level</a>, <a href="#rust_toolchain-os">os</a>, <a href="#rust_toolchain-rust_doc">rust_doc</a>, <a href="#rust_toolchain-rust_lib">rust_lib</a>, <a href="#rust_toolchain-rust_std">rust_std</a>,
-               <a href="#rust_toolchain-rustc">rustc</a>, <a href="#rust_toolchain-rustc_lib">rustc_lib</a>, <a href="#rust_toolchain-rustc_srcs">rustc_srcs</a>, <a href="#rust_toolchain-rustfmt">rustfmt</a>, <a href="#rust_toolchain-staticlib_ext">staticlib_ext</a>, <a href="#rust_toolchain-stdlib_linkflags">stdlib_linkflags</a>, <a href="#rust_toolchain-target_json">target_json</a>,
-               <a href="#rust_toolchain-target_triple">target_triple</a>)
+               <a href="#rust_toolchain-default_edition">default_edition</a>, <a href="#rust_toolchain-dylib_ext">dylib_ext</a>, <a href="#rust_toolchain-exec_triple">exec_triple</a>, <a href="#rust_toolchain-llvm_tools">llvm_tools</a>, <a href="#rust_toolchain-opt_level">opt_level</a>, <a href="#rust_toolchain-os">os</a>, <a href="#rust_toolchain-rust_doc">rust_doc</a>, <a href="#rust_toolchain-rust_lib">rust_lib</a>,
+               <a href="#rust_toolchain-rust_std">rust_std</a>, <a href="#rust_toolchain-rustc">rustc</a>, <a href="#rust_toolchain-rustc_lib">rustc_lib</a>, <a href="#rust_toolchain-rustc_srcs">rustc_srcs</a>, <a href="#rust_toolchain-rustfmt">rustfmt</a>, <a href="#rust_toolchain-staticlib_ext">staticlib_ext</a>, <a href="#rust_toolchain-stdlib_linkflags">stdlib_linkflags</a>,
+               <a href="#rust_toolchain-target_json">target_json</a>, <a href="#rust_toolchain-target_triple">target_triple</a>)
 </pre>
 
 Declares a Rust toolchain for use.
@@ -1170,6 +1170,7 @@ See @rules_rust//rust:repositories.bzl for examples of defining the @rust_cpuX r
 | <a id="rust_toolchain-default_edition"></a>default_edition |  The edition to use for rust_* rules that don't specify an edition.   | String | optional | "2018" |
 | <a id="rust_toolchain-dylib_ext"></a>dylib_ext |  The extension for dynamic libraries created from rustc.   | String | required |  |
 | <a id="rust_toolchain-exec_triple"></a>exec_triple |  The platform triple for the toolchains execution environment. For more details see: https://docs.bazel.build/versions/master/skylark/rules.html#configurations   | String | required |  |
+| <a id="rust_toolchain-llvm_tools"></a>llvm_tools |  LLVM tools that are shipped with the Rust toolchain.   | <a href="https://bazel.build/docs/build-ref.html#labels">List of labels</a> | optional | [] |
 | <a id="rust_toolchain-opt_level"></a>opt_level |  Rustc optimization levels.   | <a href="https://bazel.build/docs/skylark/lib/dict.html">Dictionary: String -> String</a> | optional | {"dbg": "0", "fastbuild": "0", "opt": "3"} |
 | <a id="rust_toolchain-os"></a>os |  The operating system for the current toolchain   | String | required |  |
 | <a id="rust_toolchain-rust_doc"></a>rust_doc |  The location of the <code>rustdoc</code> binary. Can be a direct source or a filegroup containing one item.   | <a href="https://bazel.build/docs/build-ref.html#labels">Label</a> | required |  |

docs/rust_repositories.md

@@ -35,9 +35,9 @@ A dedicated filegroup-like rule for Rust stdlib artifacts.
 
 <pre>
 rust_toolchain(<a href="#rust_toolchain-name">name</a>, <a href="#rust_toolchain-allocator_library">allocator_library</a>, <a href="#rust_toolchain-binary_ext">binary_ext</a>, <a href="#rust_toolchain-cargo">cargo</a>, <a href="#rust_toolchain-clippy_driver">clippy_driver</a>, <a href="#rust_toolchain-debug_info">debug_info</a>,
-               <a href="#rust_toolchain-default_edition">default_edition</a>, <a href="#rust_toolchain-dylib_ext">dylib_ext</a>, <a href="#rust_toolchain-exec_triple">exec_triple</a>, <a href="#rust_toolchain-opt_level">opt_level</a>, <a href="#rust_toolchain-os">os</a>, <a href="#rust_toolchain-rust_doc">rust_doc</a>, <a href="#rust_toolchain-rust_lib">rust_lib</a>, <a href="#rust_toolchain-rust_std">rust_std</a>,
-               <a href="#rust_toolchain-rustc">rustc</a>, <a href="#rust_toolchain-rustc_lib">rustc_lib</a>, <a href="#rust_toolchain-rustc_srcs">rustc_srcs</a>, <a href="#rust_toolchain-rustfmt">rustfmt</a>, <a href="#rust_toolchain-staticlib_ext">staticlib_ext</a>, <a href="#rust_toolchain-stdlib_linkflags">stdlib_linkflags</a>, <a href="#rust_toolchain-target_json">target_json</a>,
-               <a href="#rust_toolchain-target_triple">target_triple</a>)
+               <a href="#rust_toolchain-default_edition">default_edition</a>, <a href="#rust_toolchain-dylib_ext">dylib_ext</a>, <a href="#rust_toolchain-exec_triple">exec_triple</a>, <a href="#rust_toolchain-llvm_tools">llvm_tools</a>, <a href="#rust_toolchain-opt_level">opt_level</a>, <a href="#rust_toolchain-os">os</a>, <a href="#rust_toolchain-rust_doc">rust_doc</a>, <a href="#rust_toolchain-rust_lib">rust_lib</a>,
+               <a href="#rust_toolchain-rust_std">rust_std</a>, <a href="#rust_toolchain-rustc">rustc</a>, <a href="#rust_toolchain-rustc_lib">rustc_lib</a>, <a href="#rust_toolchain-rustc_srcs">rustc_srcs</a>, <a href="#rust_toolchain-rustfmt">rustfmt</a>, <a href="#rust_toolchain-staticlib_ext">staticlib_ext</a>, <a href="#rust_toolchain-stdlib_linkflags">stdlib_linkflags</a>,
+               <a href="#rust_toolchain-target_json">target_json</a>, <a href="#rust_toolchain-target_triple">target_triple</a>)
 </pre>
 
 Declares a Rust toolchain for use.
@@ -95,6 +95,7 @@ See @rules_rust//rust:repositories.bzl for examples of defining the @rust_cpuX r
 | <a id="rust_toolchain-default_edition"></a>default_edition |  The edition to use for rust_* rules that don't specify an edition.   | String | optional | "2018" |
 | <a id="rust_toolchain-dylib_ext"></a>dylib_ext |  The extension for dynamic libraries created from rustc.   | String | required |  |
 | <a id="rust_toolchain-exec_triple"></a>exec_triple |  The platform triple for the toolchains execution environment. For more details see: https://docs.bazel.build/versions/master/skylark/rules.html#configurations   | String | required |  |
+| <a id="rust_toolchain-llvm_tools"></a>llvm_tools |  LLVM tools that are shipped with the Rust toolchain.   | <a href="https://bazel.build/docs/build-ref.html#labels">List of labels</a> | optional | [] |
 | <a id="rust_toolchain-opt_level"></a>opt_level |  Rustc optimization levels.   | <a href="https://bazel.build/docs/skylark/lib/dict.html">Dictionary: String -> String</a> | optional | {"dbg": "0", "fastbuild": "0", "opt": "3"} |
 | <a id="rust_toolchain-os"></a>os |  The operating system for the current toolchain   | String | required |  |
 | <a id="rust_toolchain-rust_doc"></a>rust_doc |  The location of the <code>rustdoc</code> binary. Can be a direct source or a filegroup containing one item.   | <a href="https://bazel.build/docs/build-ref.html#labels">Label</a> | required |  |

examples/crate_universe/basic/BUILD.bazel

@@ -7,6 +7,7 @@ rust_binary(
     edition = "2018",
     deps = [
         crate("lazy_static"),
+        crate("value-bag"),
     ],
 )
 

examples/crate_universe/basic/src/main.rs

@@ -1,5 +1,6 @@
 use lazy_static::lazy_static;
 use std::collections::HashMap;
+use value_bag::ValueBag;
 
 lazy_static! {
     static ref HASHMAP: HashMap<&'static str, &'static str> = {
@@ -12,6 +13,10 @@ lazy_static! {
 }
 
 fn main() {
+    let bag = ValueBag::capture_display(&42);
+    let num = bag.to_u64().unwrap();
+
+    assert_eq!(num, 42);
     assert_eq!(HASHMAP["Daniel"], "Wagner-Hall");
     println!("It worked!");
 }

examples/crate_universe/basic/workspace.bzl

@@ -10,6 +10,10 @@ def deps():
                 name = "lazy_static",
                 semver = "=1.4",
             ),
+            crate.spec(
+                name = "value-bag",
+                semver = "=1.0.0-alpha.7",
+            ),
         ],
         supported_targets = [
             "x86_64-apple-darwin",

proto/proto.bzl

@@ -212,8 +212,6 @@ def _rust_proto_compile(protos, descriptor_sets, imports, crate_name, ctx, is_gr
         output_hash,
     ))
 
-    toolchain = find_toolchain(ctx)
-
     # Gather all dependencies for compilation
     compile_action_deps = depset(
         transform_deps(

rust/platform/triple_mappings.bzl

@@ -172,7 +172,7 @@ def cpu_arch_to_constraints(cpu_arch):
 
     return ["@platforms//cpu:{}".format(plat_suffix)]
 
-def vendor_to_constraints(vendor):
+def vendor_to_constraints(_vendor):
     # TODO(acmcarther): Review:
     #
     # My current understanding is that vendors can't have a material impact on

rust/private/clippy.bzl

@@ -61,10 +61,8 @@ def _clippy_aspect_impl(target, ctx):
 
     toolchain = find_toolchain(ctx)
     cc_toolchain, feature_configuration = find_cc_toolchain(ctx)
-    crate_type = crate_info.type
 
     dep_info, build_info, linkstamps = collect_deps(
-        label = ctx.label,
         deps = crate_info.deps,
         proc_macro_deps = crate_info.proc_macro_deps,
         aliases = crate_info.aliases,

rust/private/dummy_cc_toolchain/dummy_cc_toolchain.bzl

@@ -1,5 +1,5 @@
 # buildifier: disable=module-docstring
-def _dummy_cc_toolchain_impl(ctx):
+def _dummy_cc_toolchain_impl(_ctx):
     # The `all_files` attribute is referenced by rustc_compile_action().
     return [platform_common.ToolchainInfo(all_files = depset([]))]
 

rust/private/rust.bzl

@@ -27,11 +27,11 @@ load(
 
 # TODO(marco): Separate each rule into its own file.
 
-def _assert_no_deprecated_attributes(ctx):
+def _assert_no_deprecated_attributes(_ctx):
     """Forces a failure if any deprecated attributes were specified
 
     Args:
-        ctx (ctx): The current rule's context object
+        _ctx (ctx): The current rule's context object
     """
     pass
 

rust/private/rust_analyzer.bzl

@@ -221,7 +221,7 @@ rust_analyzer_detect_sysroot = rule(
     """),
 )
 
-def _rust_analyzer_impl(ctx):
+def _rust_analyzer_impl(_ctx):
     pass
 
 rust_analyzer = rule(

rust/private/rustc.bzl

@@ -118,15 +118,13 @@ def _are_linkstamps_supported(feature_configuration, has_grep_includes):
             has_grep_includes)
 
 def collect_deps(
-        label,
         deps,
         proc_macro_deps,
         aliases,
         are_linkstamps_supported = False):
     """Walks through dependencies and collects the transitive dependencies.
 
     Args:
-        label (str): Label of the current target.
         deps (list): The deps from ctx.attr.deps.
         proc_macro_deps (list): The proc_macro deps from ctx.attr.proc_macro_deps.
         aliases (dict): A dict mapping aliased targets to their actual Crate information.
@@ -142,7 +140,6 @@ def collect_deps(
     direct_crates = []
     transitive_crates = []
     transitive_noncrates = []
-    transitive_noncrate_libs = []
     transitive_build_infos = []
     build_info = None
     linkstamps = []
@@ -192,7 +189,6 @@ def collect_deps(
                  "targets.")
 
     transitive_crates_depset = depset(transitive = transitive_crates)
-    transitive_libs = depset([])
 
     return (
         rust_common.dep_info(
@@ -301,20 +297,12 @@ def get_linker_and_args(ctx, attr, cc_toolchain, feature_configuration, rpaths):
     return ld, link_args, link_env
 
 def _process_build_scripts(
-        ctx,
-        file,
-        crate_info,
         build_info,
-        dep_info,
         compile_inputs):
     """Gathers the outputs from a target's `cargo_build_script` action.
 
     Args:
-        ctx (ctx): The rule's context object
-        file (File): A struct containing files defined in label type attributes marked as `allow_single_file`.
-        crate_info (CrateInfo): The Crate information of the crate to process build scripts for.
         build_info (BuildInfo): The target Build's dependency info.
-        dep_info (Depinfo): The target Crate's dependency info.
         compile_inputs (depset): A set of all files that will participate in the build.
 
     Returns:
@@ -324,7 +312,7 @@ def _process_build_scripts(
             - (File): An optional path to a generated environment file from a `cargo_build_script` target
             - (list): All direct and transitive build flags from the current build info.
     """
-    extra_inputs, out_dir, build_env_file, build_flags_files = _create_extra_input_args(ctx, file, build_info, dep_info)
+    extra_inputs, out_dir, build_env_file, build_flags_files = _create_extra_input_args(build_info)
     if extra_inputs:
         compile_inputs = depset(extra_inputs, transitive = [compile_inputs])
     return compile_inputs, out_dir, build_env_file, build_flags_files
@@ -392,19 +380,16 @@ def collect_inputs(
 
     nolinkstamp_compile_inputs = depset(
         getattr(files, "data", []) +
-        [toolchain.rustc] +
-        toolchain.crosstool_files +
         ([build_info.rustc_env, build_info.flags] if build_info else []) +
         ([toolchain.target_json] if toolchain.target_json else []) +
         ([] if linker_script == None else [linker_script]),
         transitive = [
-            toolchain.rustc_lib,
-            toolchain.rust_std,
             linker_depset,
             crate_info.srcs,
             dep_info.transitive_crate_outputs,
             depset(additional_transitive_inputs),
             crate_info.compile_data,
+            toolchain.all_files,
         ],
     )
 
@@ -447,7 +432,7 @@ def collect_inputs(
     )
 
     build_env_files = getattr(files, "rustc_env_files", [])
-    compile_inputs, out_dir, build_env_file, build_flags_files = _process_build_scripts(ctx, file, crate_info, build_info, dep_info, compile_inputs)
+    compile_inputs, out_dir, build_env_file, build_flags_files = _process_build_scripts(build_info, compile_inputs)
     if build_env_file:
         build_env_files = [f for f in build_env_files] + [build_env_file]
     compile_inputs = depset(build_env_files, transitive = [compile_inputs])
@@ -666,7 +651,7 @@ def construct_arguments(
         data_paths,
     ))
 
-    # Set the SYSROOT to the directory of the rust_std files passed to the toolchain
+    # Ensure the sysroot is set for the target platform
     env["SYSROOT"] = toolchain.sysroot
 
     # extra_rustc_flags apply to the target configuration, not the exec configuration.
@@ -694,7 +679,6 @@ def rustc_compile_action(
         crate_info,
         output_hash = None,
         rust_flags = [],
-        environ = {},
         force_all_deps_direct = False):
     """Create and run a rustc compile action based on the current rule's attributes
 
@@ -705,7 +689,6 @@ def rustc_compile_action(
         crate_info (CrateInfo): The CrateInfo provider for the current target.
         output_hash (str, optional): The hashed path of the crate root. Defaults to None.
         rust_flags (list, optional): Additional flags to pass to rustc. Defaults to [].
-        environ (dict, optional): A set of makefile expandable environment variables for the action
         force_all_deps_direct (bool, optional): Whether to pass the transitive rlibs with --extern
             to the commandline as opposed to -L.
 
@@ -718,7 +701,6 @@ def rustc_compile_action(
     cc_toolchain, feature_configuration = find_cc_toolchain(ctx)
 
     dep_info, build_info, linkstamps = collect_deps(
-        label = ctx.label,
         deps = crate_info.deps,
         proc_macro_deps = crate_info.proc_macro_deps,
         aliases = crate_info.aliases,
@@ -943,14 +925,11 @@ def add_edition_flags(args, crate):
     if crate.edition != "2015":
         args.add("--edition={}".format(crate.edition))
 
-def _create_extra_input_args(ctx, file, build_info, dep_info):
+def _create_extra_input_args(build_info):
     """Gather additional input arguments from transitive dependencies
 
     Args:
-        ctx (ctx): The rule's context object
-        file (struct): A struct containing files defined in label type attributes marked as `allow_single_file`.
         build_info (BuildInfo): The BuildInfo provider from the target Crate's set of inputs.
-        dep_info (DepInfo): The Depinfo provider form the target Crate's set of inputs.
 
     Returns:
         tuple: A tuple of the following items:

rust/private/rustdoc.bzl

@@ -74,7 +74,6 @@ def rustdoc_compile_action(
     cc_toolchain, feature_configuration = find_cc_toolchain(ctx)
 
     dep_info, build_info, linkstamps = collect_deps(
-        label = ctx.label,
         deps = crate_info.deps,
         proc_macro_deps = crate_info.proc_macro_deps,
         aliases = crate_info.aliases,
@@ -120,6 +119,17 @@ def rustdoc_compile_action(
         force_link = True,
     )
 
+    # Because rustdoc tests compile tests outside of the sandbox, the sysroot
+    # must be updated to the `short_path` equivilant as it will now be
+    # a part of runfiles.
+    if is_test:
+        if "SYSROOT" in env:
+            env.update({"SYSROOT": "${{pwd}}/{}".format(toolchain.sysroot_short_path)})
+
+        # `rustdoc` does not support the SYSROOT environment variable. To account
+        # for this, the flag must be explicitly passed to the `rustdoc` binary.
+        args.rustc_flags.add("--sysroot=${{pwd}}/{}".format(toolchain.sysroot_short_path))
+
     return struct(
         executable = ctx.executable._process_wrapper,
         inputs = depset([crate_info.output], transitive = [compile_inputs]),
@@ -161,7 +171,6 @@ def _rust_doc_impl(ctx):
 
     crate = ctx.attr.crate
     crate_info = crate[rust_common.crate_info]
-    dep_info = crate[rust_common.dep_info]
 
     output_dir = ctx.actions.declare_directory("{}.rustdoc".format(ctx.label.name))