checkpoint: Passes tests

Author: blorente

lint/clippy.bzl

@@ -48,28 +48,25 @@ load("//lint/private:lint_aspect.bzl", "LintOptionsInfo", "OPTIONAL_SARIF_PARSER
 
 _MNEMONIC = "AspectRulesLintClippy"
 
-def _parse_wrapper_output_into_files(ctx, outputs, raw_process_wrapper_wrapper_output):
+def _parse_wrapper_output_into_files(ctx, output_file, exit_code_file, raw_process_wrapper_wrapper_output):
     ctx.actions.run_shell(
         command = """
 exit_code=$(head -n 1 $1)
-output=$(tail -n +1 $1)
+output=$(tail -n +2 $1)
 echo "${output}" > $2
 echo "${exit_code}" > $3
-echo "${exit_code}" > $4
 """,
         arguments = [
             raw_process_wrapper_wrapper_output.path,
-            outputs.human.out.path,
-            outputs.human.exit_code.path,
-            outputs.machine.exit_code.path,
+            output_file.path,
+            exit_code_file.path,
         ],
         inputs = [
             raw_process_wrapper_wrapper_output,
         ],
         outputs = [
-            outputs.human.out,
-            outputs.human.exit_code,
-            outputs.machine.exit_code,
+            output_file,
+            exit_code_file,
         ],
     )
 
@@ -106,21 +103,37 @@ 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.
 
-    raw_process_wrapper_wrapper_output = ctx.actions.declare_file(OUTFILE_FORMAT.format(label = target.label.name, mnemonic = _MNEMONIC, suffix = "raw_process_wrapper_wrapper_output"))
+    raw_outputs = struct(
+        human = ctx.actions.declare_file(OUTFILE_FORMAT.format(label = target.label.name, mnemonic = _MNEMONIC, suffix = "raw_process_wrapper_wrapper_output_human")),
+        machine = ctx.actions.declare_file(OUTFILE_FORMAT.format(label = target.label.name, mnemonic = _MNEMONIC, suffix = "raw_process_wrapper_wrapper_output_machine")),
+    )
+
+    rust_clippy_action.action(
+        ctx,
+        clippy_executable = clippy_bin,
+        process_wrapper = ctx.executable._process_wrapper_wrapper,
+        crate_info = crate_info,
+        config = ctx.file._config_file,
+        output = raw_outputs.human,
+        cap_at_warnings = False,
+        extra_clippy_flags = extra_options,
+    )
+
+    _parse_wrapper_output_into_files(ctx, outputs.human.out, outputs.human.exit_code, raw_outputs.human)
 
     rust_clippy_action.action(
         ctx,
         clippy_executable = clippy_bin,
         process_wrapper = ctx.executable._process_wrapper_wrapper,
         crate_info = crate_info,
         config = ctx.file._config_file,
-        output = raw_process_wrapper_wrapper_output,
+        output = raw_outputs.machine,
         cap_at_warnings = False,
         extra_clippy_flags = extra_options,
-        clippy_diagnostics_file = outputs.machine.out,
+        error_format = "json",
     )
 
-    _parse_wrapper_output_into_files(ctx, outputs, raw_process_wrapper_wrapper_output)
+    _parse_wrapper_output_into_files(ctx, outputs.machine.out, outputs.machine.exit_code, raw_outputs.machine)
 
     # FIXME: Rustc only gives us JSON output, which we can't turn into SARIF yet.
     # clippy uses rustc's IO format, which doesn't have a SARIF output mode built in,