lints: Use enum instead of bool

This is always clearer. Prep for adding another argument to this function
that's an effective bool.

Signed-off-by: Colin Walters <[email protected]>

Author: cgwalters

lib/src/cli.rs

@@ -1048,8 +1048,13 @@ async fn run_from_opt(opt: Opt) -> Result<()> {
                 if list {
                     return lints::lint_list(std::io::stdout().lock());
                 }
+                let warnings = if fatal_warnings {
+                    lints::WarningDisposition::FatalWarnings
+                } else {
+                    lints::WarningDisposition::AllowWarnings
+                };
                 let root = &Dir::open_ambient_dir(rootfs, cap_std::ambient_authority())?;
-                lints::lint(root, fatal_warnings, std::io::stdout().lock())?;
+                lints::lint(root, warnings, std::io::stdout().lock())?;
                 Ok(())
             }
         },

lib/src/lints.rs

@@ -64,6 +64,12 @@ enum LintType {
     Warning,
 }
 
+#[derive(Debug, Copy, Clone)]
+pub(crate) enum WarningDisposition {
+    AllowWarnings,
+    FatalWarnings,
+}
+
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "kebab-case")]
 struct Lint {
@@ -163,7 +169,7 @@ pub(crate) fn lint_list(output: impl std::io::Write) -> Result<()> {
 #[context("Linting")]
 pub(crate) fn lint(
     root: &Dir,
-    fatal_warnings: bool,
+    warning_disposition: WarningDisposition,
     mut output: impl std::io::Write,
 ) -> Result<()> {
     let mut fatal = 0usize;
@@ -194,7 +200,7 @@ pub(crate) fn lint(
         }
     }
     writeln!(output, "Checks passed: {passed}")?;
-    let fatal = if fatal_warnings {
+    let fatal = if matches!(warning_disposition, WarningDisposition::FatalWarnings) {
         fatal + warnings
     } else {
         fatal
@@ -424,10 +430,11 @@ mod tests {
     fn test_lint_main() -> Result<()> {
         let root = &passing_fixture()?;
         let mut out = Vec::new();
-        lint(root, true, &mut out).unwrap();
+        let warnings = WarningDisposition::FatalWarnings;
+        lint(root, warnings, &mut out).unwrap();
         root.create_dir_all("var/run/foo")?;
         let mut out = Vec::new();
-        assert!(lint(root, true, &mut out).is_err());
+        assert!(lint(root, warnings, &mut out).is_err());
         Ok(())
     }