add tests

Author: blorente

MODULE.bazel

@@ -24,7 +24,7 @@ bazel_dep(name = "rules_shell", version = "0.5.0")
 bazel_dep(name = "rules_rust", version = "0.50.1")
 git_override(
     module_name = "rules_rust",
-    commit = "4bf3797ff86bdeddbefca177ae6034a1ca0bc82c",  # tip of "blorente/extract_action_for_rules_lint",
+    commit = "b76a1bb3e596a1816b8f91bbb608b5965c2c8f70",  # tip of "blorente/extract_action_for_rules_lint",
     remote = "https://github.com/blorente/rules_rust.git",
 )
 

example/MODULE.bazel

@@ -20,7 +20,7 @@ bazel_dep(name = "rules_python", version = "0.26.0")
 bazel_dep(name = "rules_rust", version = "0.50.1")
 git_override(
     module_name = "rules_rust",
-    commit = "4bf3797ff86bdeddbefca177ae6034a1ca0bc82c",  # tip of "blorente/extract_action_for_rules_lint",
+    commit = "b76a1bb3e596a1816b8f91bbb608b5965c2c8f70",  # tip of "blorente/extract_action_for_rules_lint",
     remote = "https://github.com/blorente/rules_rust.git",
 )
 

example/src/BUILD.bazel

@@ -6,7 +6,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary")
 load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@rules_python//python:defs.bzl", "py_library")
-load("@rules_rust//rust:defs.bzl", "rust_binary")
 load("@rules_shell//shell:sh_library.bzl", "sh_library")
 load("//tools/lint:linters.bzl", "eslint_test")
 
@@ -135,9 +134,3 @@ format_test(
         "hello.sh",
     ],
 )
-
-# FIXME: Try it with transitive deps
-rust_binary(
-    name = "hello_rust",
-    srcs = ["hello.rs"],
-)

example/src/rust/BUILD.bazel

@@ -0,0 +1,38 @@
+load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library")
+
+rust_library(
+    name = "bad_lib",
+    srcs = ["bad_lib.rs"],
+    visibility = [
+        "//src/rust:__pkg__",
+        "//test:__pkg__",
+    ],
+)
+
+rust_binary(
+    name = "bad_binary",
+    srcs = ["bad_binary.rs"],
+    visibility = [
+        "//src/rust:__pkg__",
+        "//test:__pkg__",
+    ],
+)
+
+rust_binary(
+    name = "ok_binary",
+    srcs = ["ok_binary.rs"],
+    visibility = [
+        "//src/rust:__pkg__",
+        "//test:__pkg__",
+    ],
+)
+
+rust_binary(
+    name = "ok_binary_with_bad_dep",
+    srcs = ["ok_binary.rs"],
+    visibility = [
+        "//src/rust:__pkg__",
+        "//test:__pkg__",
+    ],
+    deps = [":bad_lib"],
+)

example/src/hello.rs renamed to example/src/rust/bad_binary.rs

@@ -1,7 +1,4 @@
 fn main() {
     // Will fail clippy because we could just write println!("Hello World").
     println!("{}", "Hello World");
-
-    // Will pass clippy
-    // println!("Hello World!");
 }

example/src/rust/bad_lib.rs

@@ -0,0 +1,4 @@
+fn bad() {
+    // Will fail clippy because we could just write println!("Hello World").
+    println!("{}", "Hello World");
+}

example/src/rust/ok_binary.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello World");
+}

example/test/BUILD.bazel

@@ -5,7 +5,7 @@ load("@aspect_rules_ts//ts:defs.bzl", "ts_project")
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load("@rules_python//python:defs.bzl", "py_library")
 load("@rules_shell//shell:sh_library.bzl", "sh_library")
-load("//tools/lint:linters.bzl", "checkstyle_test", "eslint_test", "flake8_test", "pmd_test", "ruff_test", "shellcheck_test")
+load("//tools/lint:linters.bzl", "checkstyle_test", "clippy_test", "eslint_test", "flake8_test", "pmd_test", "ruff_test", "shellcheck_test")
 
 write_file(
     name = "ts_code_generator",
@@ -156,3 +156,32 @@ format_test(
     srcs = [":generated_sh"],
     tags = ["manual"],
 )
+
+clippy_test(
+    name = "clippy_ok_binary",
+    srcs = ["//src/rust:ok_binary"],
+)
+
+clippy_test(
+    name = "clippy_ok_binary_with_bad_dep",
+    srcs = ["//src/rust:ok_binary_with_bad_dep"],
+    # Expected to fail based on current content of the file.
+    # Normally you'd fix the file instead of tagging this test.
+    tags = ["manual"],
+)
+
+clippy_test(
+    name = "clippy_bad_binary",
+    srcs = ["//src/rust:bad_binary"],
+    # Expected to fail based on current content of the file.
+    # Normally you'd fix the file instead of tagging this test.
+    tags = ["manual"],
+)
+
+clippy_test(
+    name = "clippy_bad_library",
+    srcs = ["//src/rust:bad_library"],
+    # Expected to fail based on current content of the file.
+    # Normally you'd fix the file instead of tagging this test.
+    tags = ["manual"],
+)

example/tools/lint/linters.bzl

@@ -24,6 +24,8 @@ clippy = lint_clippy_aspect(
     config = Label("//:.clippy.toml"),
 )
 
+clippy_test = lint_test(aspect = clippy)
+
 eslint = lint_eslint_aspect(
     binary = Label("//tools/lint:eslint"),
     # ESLint will resolve the configuration file by looking in the working directory first.

lint/clippy.bzl

@@ -45,6 +45,24 @@ load("//lint/private:lint_aspect.bzl", "LintOptionsInfo", "OPTIONAL_SARIF_PARSER
 
 _MNEMONIC = "AspectRulesLintClippy"
 
+def _marker_to_exit_code(ctx, marker, exit_code):
+    """Write 0 to exit_code if marker exists, fail otherwise.
+
+    rules_rust won't write the exit code to the success_marker, so we assert that it exists and write the exit code ourselves.
+    If there is no success marker, the action has failed anyway.
+
+    Args:
+        ctx (ctx): The rule or aspect context. Must have access to `ctx.actions.run_shell`
+        marker (File): A file that will only exist if the action has succeeded
+        exit_code (File): A file that will be written with the exit code 0 if marker exists
+    """
+    ctx.actions.run_shell(
+        outputs = [exit_code],
+        inputs = [marker],
+        arguments = [exit_code.path],
+        command = "echo '0' > $1",
+    )
+
 # buildifier: disable=function-docstring
 def _clippy_aspect_impl(target, ctx):
     if not should_visit(ctx.rule, ctx.attr._rule_kinds):
@@ -73,31 +91,35 @@ def _clippy_aspect_impl(target, ctx):
     #           (1) modify the patcher so that it can run an action through a macro, or
     #           (2) modify rules_rust so that it gives us a struct with a command line we can run it with the patcher.
 
+    human_success_indicator = ctx.actions.declare_file(OUTFILE_FORMAT.format(label = target.label.name, mnemonic = _MNEMONIC, suffix = "human_success_indicator"))
     rust_clippy_action.action(
         ctx,
         clippy_executable = clippy_bin,
         process_wrapper = ctx.executable._process_wrapper,
-        src = crate_info,
+        crate_info = crate_info,
         config = ctx.file._config_file,
         output = outputs.human.out,
-        success_marker = outputs.human.exit_code,  # This won't write the exit code, but it wil only write the file if the process has succeeded.
+        success_marker = human_success_indicator,
         cap_at_warnings = True,  # We don't want to crash the process if there are clippy errors, we just want to report them.
         extra_clippy_flags = extra_options,
     )
+    _marker_to_exit_code(ctx, human_success_indicator, outputs.human.exit_code)
 
+    machine_success_indicator = ctx.actions.declare_file(OUTFILE_FORMAT.format(label = target.label.name, mnemonic = _MNEMONIC, suffix = "machine_success_indicator"))
     raw_machine_report = ctx.actions.declare_file(OUTFILE_FORMAT.format(label = target.label.name, mnemonic = _MNEMONIC, suffix = "raw_machine_report"))
     rust_clippy_action.action(
         ctx,
         clippy_executable = clippy_bin,
         process_wrapper = ctx.executable._process_wrapper,
-        src = crate_info,
+        crate_info = crate_info,
         config = ctx.file._config_file,
         output = raw_machine_report,
-        success_marker = outputs.machine.exit_code,  # This won't write the exit code, but it wil only write the file if the process has succeeded.
+        success_marker = machine_success_indicator,
         cap_at_warnings = True,
         extra_clippy_flags = extra_options,
         error_format = "json",
     )
+    _marker_to_exit_code(ctx, machine_success_indicator, outputs.machine.exit_code)
 
     # clippy uses rustc's IO format, which doesn't have a SARIF output mode built in,
     # and they're not planning to add one.