Allow configuring rustfix::Filter independently of the mode

Author: Alexendoo

src/config.rs

@@ -1,6 +1,6 @@
 use regex::bytes::Regex;
 
-use crate::{dependencies::build_dependencies, CommandBuilder, Filter, Match, Mode};
+use crate::{dependencies::build_dependencies, CommandBuilder, Filter, Match, Mode, RustfixMode};
 pub use color_eyre;
 use color_eyre::eyre::Result;
 use std::{
@@ -72,7 +72,7 @@ impl Config {
             root_dir: root_dir.into(),
             mode: Mode::Fail {
                 require_patterns: true,
-                rustfix: true,
+                rustfix: RustfixMode::MachineApplicable,
             },
             program: CommandBuilder::rustc(),
             cfgs: CommandBuilder::cfgs(),
@@ -101,7 +101,7 @@ impl Config {
             edition: None,
             mode: Mode::Fail {
                 require_patterns: true,
-                rustfix: false,
+                rustfix: RustfixMode::Disabled,
             },
             ..Self::rustc(root_dir)
         }

src/lib.rs

@@ -731,11 +731,11 @@ fn run_rustfix(
         comments.find_one_for_revision(revision, "`no-rustfix` annotations", |r| r.no_rustfix)?;
 
     let global_rustfix = match mode {
-        Mode::Pass | Mode::Run { .. } | Mode::Panic => false,
+        Mode::Pass | Mode::Run { .. } | Mode::Panic => RustfixMode::Disabled,
         Mode::Fail { rustfix, .. } | Mode::Yolo { rustfix } => rustfix,
     };
 
-    let fixed_code = (no_run_rustfix.is_none() && global_rustfix)
+    let fixed_code = (no_run_rustfix.is_none() && global_rustfix.enabled())
         .then_some(())
         .and_then(|()| {
             let suggestions = std::str::from_utf8(stderr)
@@ -748,7 +748,7 @@ fn run_rustfix(
                     rustfix::get_suggestions_from_json(
                         line,
                         &HashSet::new(),
-                        if let Mode::Yolo { .. } = config.mode {
+                        if global_rustfix == RustfixMode::Everything {
                             rustfix::Filter::Everything
                         } else {
                             rustfix::Filter::MachineApplicableOnly

src/mode.rs

@@ -5,6 +5,23 @@ use crate::Errored;
 use std::fmt::Display;
 use std::process::ExitStatus;
 
+/// When to run rustfix on tests
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub enum RustfixMode {
+    /// Do not run rustfix on the test
+    Disabled,
+    /// Apply only `MachineApplicable` suggestions emitted by the test
+    MachineApplicable,
+    /// Apply all suggestions emitted by the test
+    Everything,
+}
+
+impl RustfixMode {
+    pub(crate) fn enabled(self) -> bool {
+        self != RustfixMode::Disabled
+    }
+}
+
 #[derive(Copy, Clone, Debug)]
 /// Decides what is expected of each test's exit status.
 pub enum Mode {
@@ -21,13 +38,13 @@ pub enum Mode {
     Fail {
         /// Whether failing tests must have error patterns. Set to false if you just care about .stderr output.
         require_patterns: bool,
-        /// Whether to run rustfix on the test if it has machine applicable suggestions.
-        rustfix: bool,
+        /// When to run rustfix on the test
+        rustfix: RustfixMode,
     },
     /// Run the tests, but always pass them as long as all annotations are satisfied and stderr files match.
     Yolo {
-        /// Whether to run
-        rustfix: bool,
+        /// When to run rustfix on the test
+        rustfix: RustfixMode,
     },
 }
 

tests/integrations/basic-fail-mode/tests/ui_tests.rs

@@ -6,7 +6,7 @@ fn main() -> ui_test::color_eyre::Result<()> {
         dependencies_crate_manifest_path: Some("Cargo.toml".into()),
         mode: Mode::Fail {
             require_patterns: true,
-            rustfix: true,
+            rustfix: RustfixMode::MachineApplicable,
         },
         ..Config::rustc("tests/actual_tests")
     };

tests/integrations/basic-fail/tests/ui_tests_bless.rs

@@ -4,9 +4,9 @@ fn main() -> ui_test::color_eyre::Result<()> {
     for mode in [
         Mode::Fail {
             require_patterns: true,
-            rustfix: true,
+            rustfix: RustfixMode::MachineApplicable,
         },
-        Mode::Yolo { rustfix: true },
+        Mode::Yolo { rustfix: RustfixMode::Everything },
     ] {
         let path = "../../../target";