Use _validation output group for rustfmt/clippy

Author: dzbarsky

.bazelrc

@@ -26,11 +26,9 @@ coverage --experimental_fetch_all_coverage_outputs
 
 # Enable rustfmt for all targets in the workspace
 build:rustfmt --aspects=//rust:defs.bzl%rustfmt_aspect
-build:rustfmt --output_groups=+rustfmt_checks
 
 # Enable clippy for all targets in the workspace
 build:clippy --aspects=//rust:defs.bzl%rust_clippy_aspect
-build:clippy --output_groups=+clippy_checks
 
 ###############################################################################
 ## Incompatibility flags

docs/flatten.md

@@ -2180,7 +2180,7 @@ rust_test(
 Then the targets can be analyzed with clippy using the following command:
 
 ```output
-$ bazel build --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect               --output_groups=clippy_checks //hello_lib:all
+$ bazel build --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect //hello_lib:all
 ```
 
 
@@ -2208,7 +2208,7 @@ This aspect is used to gather information about a crate for use in rustfmt and p
 
 Output Groups:
 
-- `rustfmt_checks`: Executes `rustfmt --check` on the specified target.
+- `_validation`: Executes `rustfmt --check` on the specified target.
 
 The build setting `@rules_rust//:rustfmt.toml` is used to control the Rustfmt [configuration settings][cs]
 used at runtime.

docs/rust_clippy.md

@@ -22,7 +22,6 @@ Simply add the following to the `.bazelrc` file in the root of your workspace:
 
 ```text
 build --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
-build --output_groups=+clippy_checks
 ```
 
 This will enable clippy on all [Rust targets](./defs.md).
@@ -123,7 +122,7 @@ rust_test(
 Then the targets can be analyzed with clippy using the following command:
 
 ```output
-$ bazel build --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect               --output_groups=clippy_checks //hello_lib:all
+$ bazel build --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect //hello_lib:all
 ```
 
 

docs/rust_clippy.vm

@@ -16,7 +16,6 @@ Simply add the following to the `.bazelrc` file in the root of your workspace:
 
 ```text
 build --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
-build --output_groups=+clippy_checks
 ```
 
 This will enable clippy on all [Rust targets](./defs.md).

docs/rust_fmt.md

@@ -24,14 +24,13 @@ in your workspace. Simply run `bazel run @rules_rust//:rustfmt` to format source
 
 In addition to this formatter, a simple check can be performed using the [rustfmt_aspect](#rustfmt-aspect) aspect by running
 ```text
-bazel build --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect --output_groups=rustfmt_checks
+bazel build --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
 ```
 
 Add the following to a `.bazelrc` file to enable this check during the build phase.
 
 ```text
 build --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
-build --output_groups=+rustfmt_checks
 ```
 
 It's recommended to only enable this aspect in your CI environment so formatting issues do not
@@ -103,7 +102,7 @@ This aspect is used to gather information about a crate for use in rustfmt and p
 
 Output Groups:
 
-- `rustfmt_checks`: Executes `rustfmt --check` on the specified target.
+- `_validation`: Executes `rustfmt --check` on the specified target.
 
 The build setting `@rules_rust//:rustfmt.toml` is used to control the Rustfmt [configuration settings][cs]
 used at runtime.

docs/rust_fmt.vm

@@ -17,14 +17,13 @@ in your workspace. Simply run `bazel run @rules_rust//:rustfmt` to format source
 
 In addition to this formatter, a simple check can be performed using the [rustfmt_aspect](#rustfmt-aspect) aspect by running
 ```text
-bazel build --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect --output_groups=rustfmt_checks
+bazel build --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
 ```
 
 Add the following to a `.bazelrc` file to enable this check during the build phase.
 
 ```text
 build --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
-build --output_groups=+rustfmt_checks
 ```
 
 It's recommended to only enable this aspect in your CI environment so formatting issues do not

examples/.bazelrc

@@ -8,11 +8,9 @@ build:windows --enable_runfiles
 
 # Enable rustfmt for all targets in the workspace
 build:rustfmt --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
-build:rustfmt --output_groups=+rustfmt_checks
 
 # Enable clippy for all targets in the workspace
 build:clippy --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
-build:clippy --output_groups=+clippy_checks
 
 # This import should always be last to allow users to override
 # settings for local development.

examples/crate_universe/.bazelrc

@@ -8,11 +8,9 @@ build:windows --enable_runfiles
 
 # Enable rustfmt for all targets in the workspace
 build:rustfmt --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
-build:rustfmt --output_groups=+rustfmt_checks
 
 # Enable clippy for all targets in the workspace
 build:clippy --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
-build:clippy --output_groups=+clippy_checks
 
 # Confirm crate universe works without relying on the legacy
 # external symlink in runfiles.

examples/crate_universe/cargo_aliases/.bazelrc

@@ -7,11 +7,9 @@ build:windows --enable_runfiles
 
 # Enable rustfmt
 build:strict --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
-build:strict --output_groups=+rustfmt_checks
 
 # Enable clippy
 build:strict --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
-build:strict --output_groups=+clippy_checks
 
 # This import should always be last to allow users to override
 # settings for local development.

examples/crate_universe/cargo_remote/.bazelrc

@@ -7,11 +7,9 @@ build:windows --enable_runfiles
 
 # Enable rustfmt
 build:strict --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
-build:strict --output_groups=+rustfmt_checks
 
 # Enable clippy
 build:strict --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
-build:strict --output_groups=+clippy_checks
 
 # This import should always be last to allow users to override
 # settings for local development.

examples/crate_universe/cargo_workspace/.bazelrc

@@ -7,11 +7,9 @@ build:windows --enable_runfiles
 
 # Enable rustfmt
 build:strict --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
-build:strict --output_groups=+rustfmt_checks
 
 # Enable clippy
 build:strict --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
-build:strict --output_groups=+clippy_checks
 
 # This import should always be last to allow users to override
 # settings for local development.

examples/crate_universe/multi_package/.bazelrc

@@ -7,11 +7,9 @@ build:windows --enable_runfiles
 
 # Enable rustfmt
 build:strict --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
-build:strict --output_groups=+rustfmt_checks
 
 # Enable clippy
 build:strict --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
-build:strict --output_groups=+clippy_checks
 
 # This import should always be last to allow users to override
 # settings for local development.

examples/crate_universe/no_cargo_manifests/.bazelrc

@@ -7,11 +7,9 @@ build:windows --enable_runfiles
 
 # Enable rustfmt
 build:strict --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
-build:strict --output_groups=+rustfmt_checks
 
 # Enable clippy
 build:strict --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
-build:strict --output_groups=+clippy_checks
 
 # This import should always be last to allow users to override
 # settings for local development.

examples/crate_universe_unnamed/.bazelrc

@@ -8,11 +8,9 @@ build:windows --enable_runfiles
 
 # Enable rustfmt for all targets in the workspace
 build:rustfmt --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
-build:rustfmt --output_groups=+rustfmt_checks
 
 # Enable clippy for all targets in the workspace
 build:clippy --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
-build:clippy --output_groups=+clippy_checks
 
 # This import should always be last to allow users to override
 # settings for local development.

rust/private/clippy.bzl

@@ -82,7 +82,7 @@ def _get_clippy_ready_crate_info(target, aspect_ctx = None):
 def _clippy_aspect_impl(target, ctx):
     crate_info = _get_clippy_ready_crate_info(target, ctx)
     if not crate_info:
-        return [ClippyInfo(output = depset([]))]
+        return [ClippyInfo(output = depset())]
 
     toolchain = find_toolchain(ctx)
     cc_toolchain, feature_configuration = find_cc_toolchain(ctx)
@@ -181,14 +181,12 @@ See https://github.com/bazelbuild/rules_rust/pull/1264#discussion_r853241339 for
     )
 
     return [
-        OutputGroupInfo(clippy_checks = depset([clippy_out])),
+        OutputGroupInfo(_validation = depset([clippy_out])),
         ClippyInfo(output = depset([clippy_out])),
     ]
 
 # Example: Run the clippy checker on all targets in the codebase.
-#   bazel build --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect \
-#               --output_groups=clippy_checks \
-#               //...
+#   bazel build --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect //...
 rust_clippy_aspect = aspect(
     fragments = ["cpp"],
     host_fragments = ["cpp"],
@@ -266,15 +264,14 @@ rust_test(
 Then the targets can be analyzed with clippy using the following command:
 
 ```output
-$ bazel build --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect \
-              --output_groups=clippy_checks //hello_lib:all
+$ bazel build --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect //hello_lib:all
 ```
 """,
 )
 
 def _rust_clippy_rule_impl(ctx):
-    clippy_ready_targets = [dep for dep in ctx.attr.deps if "clippy_checks" in dir(dep[OutputGroupInfo])]
-    files = depset([], transitive = [dep[OutputGroupInfo].clippy_checks for dep in clippy_ready_targets])
+    clippy_ready_targets = [dep for dep in ctx.attr.deps if ClippyInfo in dep[OutputGroupInfo]]
+    files = depset([], transitive = [dep[OutputGroupInfo]._validation for dep in clippy_ready_targets])
     return [DefaultInfo(files = files)]
 
 rust_clippy = rule(

rust/private/rustfmt.bzl

@@ -111,7 +111,7 @@ def _rustfmt_aspect_impl(target, ctx):
 
     return [
         OutputGroupInfo(
-            rustfmt_checks = depset([marker]),
+            _validation = depset([marker]),
         ),
     ]
 
@@ -122,7 +122,7 @@ This aspect is used to gather information about a crate for use in rustfmt and p
 
 Output Groups:
 
-- `rustfmt_checks`: Executes `rustfmt --check` on the specified target.
+- `_validation`: Executes `rustfmt --check` on the specified target.
 
 The build setting `@rules_rust//:rustfmt.toml` is used to control the Rustfmt [configuration settings][cs]
 used at runtime.

test/rust_analyzer/rust_analyzer_test_runner.sh

@@ -40,9 +40,7 @@ test --test_output=errors
 # targets that would otherwise not run due to them being tagged as "manual".
 # Note that that tag is stripped for this test.
 build:strict --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
-build:strict --output_groups=+rustfmt_checks
 build:strict --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
-build:strict --output_groups=+clippy_checks
 EOF
 
     echo "${new_workspace}"

test/unit/clippy/clippy_test.bzl

@@ -2,6 +2,7 @@
 
 load("@bazel_skylib//lib:unittest.bzl", "analysistest")
 load("//rust:defs.bzl", "rust_clippy_aspect")
+load("//rust:rust_common.bzl", "ClippyInfo")
 load("//test/unit:common.bzl", "assert_argv_contains", "assert_list_contains_adjacent_elements")
 
 def _find_clippy_action(actions):
@@ -24,7 +25,7 @@ def _clippy_aspect_action_has_flag_impl(ctx, flags):
             flag,
         )
 
-    clippy_checks = target[OutputGroupInfo].clippy_checks.to_list()
+    clippy_checks = target[ClippyInfo].output.to_list()
     if len(clippy_checks) != 1:
         fail("clippy_checks is only expected to contain 1 file")