Merge branch 'main' into zbarsky/update-deps

Author: dzbarsky

.github/workflows/release.yaml

@@ -57,6 +57,9 @@ jobs:
           - os: windows-2022
             env:
               TARGET: "aarch64-pc-windows-msvc"
+          - os: ubuntu-22.04
+            env:
+              TARGET: "s390x-unknown-linux-gnu"
           - os: macOS-13
             env:
               TARGET: "x86_64-apple-darwin"
@@ -217,6 +220,15 @@ jobs:
           asset_name: cargo-bazel-aarch64-unknown-linux-gnu
           asset_path: ${{ github.workspace }}/crate_universe/target/artifacts/aarch64-unknown-linux-gnu/cargo-bazel
           asset_content_type: application/octet-stream
+      - name: "Upload s390x-unknown-linux-gnu"
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.rules_rust_release.outputs.upload_url }}
+          asset_name: cargo-bazel-s390x-unknown-linux-gnu
+          asset_path: ${{ github.workspace }}/crate_universe/target/artifacts/s390x-unknown-linux-gnu/cargo-bazel
+          asset_content_type: application/octet-stream
       - name: "Upload x86_64-apple-darwin"
         uses: actions/upload-release-asset@v1
         env:

.pre-commit-config.yaml

@@ -12,19 +12,17 @@ repos:
       - id: buildifier-lint
         args: [--version, "v8.2.0", --warnings=all]
   - repo: https://github.com/crate-ci/typos
-    rev: v1.35.3
+    rev: v1.35.5
     hooks:
       - id: typos
         exclude: |
           (?x)^(
             crate_universe/test_data|
             examples|
-            extensions|
-            ffi|
-            rust|
-            tools|
-            util
+            extensions
           )
+        exclude_types:
+          - diff
   - repo: https://github.com/psf/black
     rev: 24.10.0
     hooks:

crate_universe/extensions.bzl

@@ -684,9 +684,7 @@ def _generate_hub_and_spokes(
 
     paths_to_track = json.decode(module_ctx.read(paths_to_track_file))
     for path in paths_to_track:
-        # This read triggers watching the file at this path and invalidates the repository_rule which will get re-run.
-        # Ideally we'd use module_ctx.watch, but it doesn't support files outside of the workspace, and we need to support that.
-        module_ctx.read(path)
+        module_ctx.watch(path)
 
     warnings_output_file = json.decode(module_ctx.read(warnings_output_file))
     for warning in warnings_output_file:

crate_universe/private/crates_repository.bzl

@@ -119,9 +119,7 @@ def _crates_repository_impl(repository_ctx):
 
     paths_to_track = json.decode(repository_ctx.read(paths_to_track_file))
     for path in paths_to_track:
-        # This read triggers watching the file at this path and invalidates the repository_rule which will get re-run.
-        # Ideally we'd use repository_ctx.watch, but it doesn't support files outside of the workspace, and we need to support that.
-        repository_ctx.read(path)
+        repository_ctx.watch(path)
 
     warnings_output_file = json.decode(repository_ctx.read(warnings_output_file))
     for warning in warnings_output_file:

crate_universe/src/cli/generate.rs

@@ -137,6 +137,7 @@ pub fn generate(opt: GenerateOptions) -> Result<()> {
                     .values()
                     .filter_map(|crate_context| crate_context.repository.as_ref()),
                 context.unused_patches.iter(),
+                &opt.nonhermetic_root_bazel_workspace_dir,
             )?;
 
             return Ok(());
@@ -193,6 +194,7 @@ pub fn generate(opt: GenerateOptions) -> Result<()> {
         splicing_manifest.manifests.keys().cloned(),
         annotations.lockfile.crates.values(),
         cargo_lockfile.patch.unused.iter(),
+        &opt.nonhermetic_root_bazel_workspace_dir,
     )?;
 
     // Generate renderable contexts for each package
@@ -252,6 +254,7 @@ fn write_paths_to_track<
     manifests: Paths,
     source_annotations: SourceAnnotations,
     unused_patches: UnusedPatches,
+    nonhermetic_root_bazel_workspace_dir: &Utf8PathBuf,
 ) -> Result<()> {
     let source_annotation_manifests: BTreeSet<_> = source_annotations
         .filter_map(|v| {
@@ -266,6 +269,8 @@ fn write_paths_to_track<
         .iter()
         .cloned()
         .chain(manifests)
+        // Paths outside the bazel workspace cannot be `.watch`-ed.
+        .filter(|p| p.starts_with(nonhermetic_root_bazel_workspace_dir))
         .collect();
     std::fs::write(
         output_file,

extensions/prost/private/prost.bzl

@@ -18,7 +18,12 @@ load("@rules_rust//rust/private:rust_analyzer.bzl", "write_rust_analyzer_spec_fi
 load("@rules_rust//rust/private:rustc.bzl", "rustc_compile_action")
 
 # buildifier: disable=bzl-visibility
-load("@rules_rust//rust/private:utils.bzl", "can_build_metadata")
+load(
+    "@rules_rust//rust/private:utils.bzl",
+    "can_build_metadata",
+    "can_use_metadata_for_pipelining",
+    "generate_output_diagnostics",
+)
 load("//:providers.bzl", "ProstProtoInfo")
 load(":prost_transform.bzl", "ProstTransformInfo")
 
@@ -181,6 +186,8 @@ def _compile_rust(
 
     lib = ctx.actions.declare_file(lib_name)
     rmeta = None
+    rustc_rmeta_output = None
+    metadata_supports_pipelining = False
 
     if can_build_metadata(toolchain, ctx, "rlib"):
         rmeta_name = "{prefix}{name}-{lib_hash}{extension}".format(
@@ -190,6 +197,8 @@ def _compile_rust(
             extension = ".rmeta",
         )
         rmeta = ctx.actions.declare_file(rmeta_name)
+        rustc_rmeta_output = generate_output_diagnostics(ctx, rmeta)
+        metadata_supports_pipelining = can_use_metadata_for_pipelining(toolchain, "rlib")
 
     providers = rustc_compile_action(
         ctx = ctx,
@@ -205,6 +214,8 @@ def _compile_rust(
             aliases = {},
             output = lib,
             metadata = rmeta,
+            metadata_supports_pipelining = metadata_supports_pipelining,
+            rustc_rmeta_output = rustc_rmeta_output,
             edition = edition,
             is_test = False,
             rustc_env = {},
@@ -373,7 +384,12 @@ rust_prost_aspect = aspect(
             executable = True,
             default = Label("//private:protoc_wrapper"),
         ),
-    } | RUSTC_ATTRS,
+    } | RUSTC_ATTRS | {
+        # Need to override this attribute to explicitly set the workspace.
+        "_always_enable_metadata_output_groups": attr.label(
+            default = Label("@rules_rust//rust/settings:always_enable_metadata_output_groups"),
+        ),
+    },
     fragments = ["cpp"],
     toolchains = [
         TOOLCHAIN_TYPE,

extensions/protobuf/proto.bzl

@@ -20,7 +20,16 @@ load("@rules_proto//proto:defs.bzl", "ProtoInfo")
 load("@rules_rust//rust/private:rustc.bzl", "rustc_compile_action")
 
 # buildifier: disable=bzl-visibility
-load("@rules_rust//rust/private:utils.bzl", "can_build_metadata", "compute_crate_name", "determine_output_hash", "find_toolchain", "transform_deps")
+load(
+    "@rules_rust//rust/private:utils.bzl",
+    "can_build_metadata",
+    "can_use_metadata_for_pipelining",
+    "compute_crate_name",
+    "determine_output_hash",
+    "find_toolchain",
+    "generate_output_diagnostics",
+    "transform_deps",
+)
 load(
     "//:toolchain.bzl",
     _generate_proto = "rust_generate_proto",
@@ -194,12 +203,16 @@ def _rust_proto_compile(protos, descriptor_sets, imports, crate_name, ctx, is_gr
         output_hash,
     ))
     rust_metadata = None
+    rustc_rmeta_output = None
+    metadata_supports_pipelining = False
     if can_build_metadata(toolchain, ctx, "rlib"):
         rust_metadata = ctx.actions.declare_file("%s/lib%s-%s.rmeta" % (
             output_dir,
             crate_name,
             output_hash,
         ))
+        rustc_rmeta_output = generate_output_diagnostics(ctx, rust_metadata)
+        metadata_supports_pipelining = can_use_metadata_for_pipelining(toolchain, "rlib")
 
     # Gather all dependencies for compilation
     compile_action_deps = depset(
@@ -223,6 +236,8 @@ def _rust_proto_compile(protos, descriptor_sets, imports, crate_name, ctx, is_gr
             aliases = {},
             output = rust_lib,
             metadata = rust_metadata,
+            metadata_supports_pipelining = metadata_supports_pipelining,
+            rustc_rmeta_output = rustc_rmeta_output,
             edition = proto_toolchain.edition,
             rustc_env = {},
             is_test = False,
@@ -311,6 +326,9 @@ rust_proto_library = rule(
                 file of arguments to rustc: `@$(location //package:target)`.
             """,
         ),
+        "_always_enable_metadata_output_groups": attr.label(
+            default = Label("@rules_rust//rust/settings:always_enable_metadata_output_groups"),
+        ),
         "_optional_output_wrapper": attr.label(
             executable = True,
             cfg = "exec",

rust/platform/triple_mappings.bzl

@@ -282,7 +282,7 @@ _SYSTEM_TO_STDLIB_LINKFLAGS = {
 }
 
 def cpu_arch_to_constraints(cpu_arch, *, system = None):
-    """Returns a list of contraint values which represents a triple's CPU.
+    """Returns a list of constraint values which represents a triple's CPU.
 
     Args:
         cpu_arch (str): The architecture to match constraints for

rust/private/BUILD.bazel

@@ -28,6 +28,7 @@ bzl_library(
         ":rules_cc_bzl_lib",
         "//rust/platform:bzl_lib",
         "@bazel_skylib//lib:paths",
+        "@bazel_skylib//lib:structs",
         "@bazel_skylib//rules:common_settings",
     ],
 )

rust/private/clippy.bzl

@@ -14,8 +14,15 @@
 
 """A module defining clippy rules"""
 
+load("@bazel_skylib//lib:structs.bzl", "structs")
 load("//rust/private:common.bzl", "rust_common")
-load("//rust/private:providers.bzl", "CaptureClippyOutputInfo", "ClippyInfo", "LintsInfo")
+load(
+    "//rust/private:providers.bzl",
+    "CaptureClippyOutputInfo",
+    "ClippyInfo",
+    "ClippyOutputDiagnosticsInfo",
+    "LintsInfo",
+)
 load(
     "//rust/private:rustc.bzl",
     "collect_deps",
@@ -146,6 +153,13 @@ def _clippy_aspect_impl(target, ctx):
         "_clippy_error_format" if use_clippy_error_format else "_error_format",
     )
 
+    clippy_diagnostics = None
+    if ctx.attr._clippy_output_diagnostics[ClippyOutputDiagnosticsInfo].output_diagnostics:
+        clippy_diagnostics = ctx.actions.declare_file(ctx.label.name + ".clippy.diagnostics", sibling = crate_info.output)
+        crate_info_dict = structs.to_dict(crate_info)
+        crate_info_dict["rustc_output"] = clippy_diagnostics
+        crate_info = rust_common.create_crate_info(**crate_info_dict)
+
     args, env = construct_arguments(
         ctx = ctx,
         attr = ctx.rule.attr,
@@ -165,6 +179,7 @@ def _clippy_aspect_impl(target, ctx):
         build_flags_files = build_flags_files,
         emit = ["dep-info", "metadata"],
         skip_expanding_rustc_env = True,
+        use_json_output = bool(clippy_diagnostics),
         error_format = error_format,
     )
 
@@ -217,7 +232,7 @@ def _clippy_aspect_impl(target, ctx):
     ctx.actions.run(
         executable = ctx.executable._process_wrapper,
         inputs = compile_inputs,
-        outputs = [clippy_out],
+        outputs = [clippy_out] + [x for x in [clippy_diagnostics] if x],
         env = env,
         tools = [toolchain.clippy_driver],
         arguments = args.all,
@@ -226,8 +241,12 @@ def _clippy_aspect_impl(target, ctx):
         toolchain = "@rules_rust//rust:toolchain_type",
     )
 
+    output_group_info = {"clippy_checks": depset([clippy_out])}
+    if clippy_diagnostics:
+        output_group_info["clippy_output"] = depset([clippy_diagnostics])
+
     return [
-        OutputGroupInfo(clippy_checks = depset([clippy_out])),
+        OutputGroupInfo(**output_group_info),
         ClippyInfo(output = depset([clippy_out])),
     ]
 
@@ -255,6 +274,10 @@ rust_clippy_aspect = aspect(
             doc = "Arguments to pass to clippy",
             default = Label("//rust/settings:clippy_flags"),
         ),
+        "_clippy_output_diagnostics": attr.label(
+            doc = "Value of the `clippy_output_diagnostics` build setting",
+            default = "//rust/settings:clippy_output_diagnostics",
+        ),
         "_config": attr.label(
             doc = "The `clippy.toml` file used for configuration",
             allow_single_file = True,
@@ -395,3 +418,25 @@ capture_clippy_output = rule(
     implementation = _capture_clippy_output_impl,
     build_setting = config.bool(flag = True),
 )
+
+def _clippy_output_diagnostics_impl(ctx):
+    """Implementation of the `clippy_output_diagnostics` rule
+
+    Args:
+        ctx (ctx): The rule's context object
+
+    Returns:
+        list: A list containing the CaptureClippyOutputInfo provider
+    """
+    return [ClippyOutputDiagnosticsInfo(output_diagnostics = ctx.build_setting_value)]
+
+clippy_output_diagnostics = rule(
+    doc = (
+        "Setting this flag from the command line with `--@rules_rust//rust/settings:clippy_output_diagnostics` " +
+        "makes rules_rust save lippy json output (suitable for consumption by rust-analyzer) in a file, " +
+        "available from the `clippy_output` output group. This is the clippy equivalent of " +
+        "`@rules_rust//settings:rustc_output_diagnostics`."
+    ),
+    implementation = _clippy_output_diagnostics_impl,
+    build_setting = config.bool(flag = True),
+)