Address comments

Author: blorente

rust/private/clippy.bzl

@@ -203,7 +203,7 @@ def rust_clippy_action(ctx, clippy_executable, process_wrapper, crate_info, conf
         outputs.append(success_marker)
 
     if forward_clippy_exit_code == False:
-        args.process_wrapper_flags.add("--forward-exit-code", "false")
+        args.process_wrapper_flags.add("--swallow-subprocess-exit-code", "true")
 
     if exit_code_file != None:
         args.process_wrapper_flags.add("--exit-code-file", exit_code_file)

util/process_wrapper/main.rs

@@ -241,10 +241,10 @@ fn main() -> Result<(), ProcessWrapperError> {
             .map_err(|e| ProcessWrapperError(format!("failed to write exit code to file: {}", e)))?;
     }
 
-    if opts.forward_exit_code {
-        exit(code)
-    } else {
+    if opts.swallow_exit_code {
         exit(0)
+    } else {
+        exit(code)
     }
 }
 

util/process_wrapper/options.rs

@@ -44,8 +44,8 @@ pub(crate) struct Options {
     // If set, also logs all unprocessed output from the rustc output to this file.
     // Meant to be used to get json output out of rustc for tooling usage.
     pub(crate) output_file: Option<String>,
-    // If set, exit with the same code as the child process.
-    pub(crate) forward_exit_code: bool,
+    // If set, don't exit with the same exit code as the child process.
+    pub(crate) swallow_exit_code: bool,
     // If set, writes the exit code of the process into this file.
     pub(crate) exit_code_file: Option<String>,
     // If set, it configures rustc to emit an rmeta file and then
@@ -68,7 +68,7 @@ pub(crate) fn options() -> Result<Options, OptionError> {
     let mut stdout_file = None;
     let mut stderr_file = None;
     let mut output_file = None;
-    let mut forward_exit_code_raw = None;
+    let mut swallow_exit_code_raw = None;
     let mut exit_code_file = None;
     let mut rustc_quit_on_rmeta_raw = None;
     let mut rustc_output_format_raw = None;
@@ -109,9 +109,9 @@ pub(crate) fn options() -> Result<Options, OptionError> {
         &mut output_file,
     );
     flags.define_flag(
-        "--forward-exit-code",
-        "If set, the process_wrapper will exit with the same exit code as the subprocess if it had no internal errors. True by default, disable with `--forward-exit-code=false`",
-        &mut forward_exit_code_raw,
+        "--swallow-subprocess-exit-code",
+        "If set, the process_wrapper will not forward the exit code for the subprocess, and instead only fail if there are internal errors.",
+        &mut swallow_exit_code_raw,
     );
     flags.define_flag(
         "--exit-code-file",
@@ -195,8 +195,7 @@ pub(crate) fn options() -> Result<Options, OptionError> {
         })
         .transpose()?;
 
-    // As we want `true` by default, we accept anything except `"false"` as `"true"`
-    let forward_exit_code = forward_exit_code_raw.is_some_and(|s| s != "false");
+    let swallow_exit_code = swallow_exit_code_raw.is_some_and(|s| s != "true");
     let rustc_quit_on_rmeta = rustc_quit_on_rmeta_raw.is_some_and(|s| s == "true");
     let rustc_output_format = rustc_output_format_raw
         .map(|v| match v.as_str() {
@@ -245,7 +244,7 @@ pub(crate) fn options() -> Result<Options, OptionError> {
         stdout_file,
         stderr_file,
         output_file,
-        forward_exit_code,
+        swallow_exit_code,
         exit_code_file,
         rustc_quit_on_rmeta,
         rustc_output_format,