refactor: simplify lint exit codes and remove formatter failure state

Author: gvozdvmozgu

Cargo.toml

@@ -17,12 +17,12 @@ perf = "warn"
 cloned_instead_of_copied = "warn"
 
 # https://github.com/rustwasm/wasm-bindgen/issues/3451#issuecomment-1562982835
-#[profile.dev]
-#opt-level = "s"
+[profile.dev]
+opt-level = "s"
 
-#[profile.release]
-#lto = true
-#codegen-units = 1
+[profile.release]
+lto = true
+codegen-units = 1
 
 [workspace.dependencies]
 ahash = { version = "0.8.11", features = ["compile-time-rng", "serde"] }

crates/cli-lib/src/commands_lint.rs

@@ -11,15 +11,11 @@ pub(crate) fn run_lint(
 ) -> i32 {
     let LintArgs { paths, format } = args;
     let mut linter = linter(config, format, collect_parse_errors);
-
-    linter.lint_paths(paths, false, &ignorer);
+    let result = linter.lint_paths(paths, false, &ignorer);
 
     linter.formatter().unwrap().completion_message();
-    if linter.formatter().unwrap().has_fail() {
-        1
-    } else {
-        0
-    }
+
+    result.has_violations() as i32
 }
 
 pub(crate) fn run_lint_stdin(
@@ -30,13 +26,9 @@ pub(crate) fn run_lint_stdin(
     let read_in = crate::stdin::read_std_in().unwrap();
 
     let linter = linter(config, format, collect_parse_errors);
-    linter.lint_string(&read_in, None, false);
+    let result = linter.lint_string(&read_in, None, false);
 
     linter.formatter().unwrap().completion_message();
 
-    if linter.formatter().unwrap().has_fail() {
-        1
-    } else {
-        0
-    }
+    result.has_violations() as i32
 }

crates/lib/src/cli/formatters.rs

@@ -1,7 +1,7 @@
 use super::utils::*;
 use std::borrow::Cow;
 use std::io::{Stderr, Write};
-use std::sync::atomic::{AtomicBool, AtomicUsize};
+use std::sync::atomic::AtomicUsize;
 
 use anstyle::{AnsiColor, Effects, Style};
 use itertools::enumerate;
@@ -24,8 +24,6 @@ pub trait Formatter: Send + Sync {
 
     fn dispatch_file_violations(&self, linted_file: &LintedFile, only_fixable: bool);
 
-    fn has_fail(&self) -> bool;
-
     fn completion_message(&self);
 }
 
@@ -35,7 +33,6 @@ pub struct OutputStreamFormatter {
     filter_empty: bool,
     verbosity: i32,
     output_line_length: usize,
-    pub has_fail: AtomicBool,
     files_dispatched: AtomicUsize,
 }
 
@@ -55,10 +52,6 @@ impl Formatter for OutputStreamFormatter {
             .fetch_add(1, std::sync::atomic::Ordering::SeqCst);
     }
 
-    fn has_fail(&self) -> bool {
-        self.has_fail.load(std::sync::atomic::Ordering::SeqCst)
-    }
-
     fn completion_message(&self) {
         let count = self
             .files_dispatched
@@ -92,7 +85,6 @@ impl OutputStreamFormatter {
             filter_empty: true,
             verbosity,
             output_line_length: 80,
-            has_fail: false.into(),
             files_dispatched: 0.into(),
         }
     }
@@ -146,11 +138,7 @@ impl OutputStreamFormatter {
 
         let color = match status {
             Status::Pass | Status::Fixed => AnsiColor::Green,
-            Status::Fail | Status::Error => {
-                self.has_fail
-                    .store(true, std::sync::atomic::Ordering::SeqCst);
-                AnsiColor::Red
-            }
+            Status::Fail | Status::Error => AnsiColor::Red,
         }
         .on_default();
 

crates/lib/src/cli/github_annotation_native_formatter.rs

@@ -70,10 +70,6 @@ impl Formatter for GithubAnnotationNativeFormatter {
         }
     }
 
-    fn has_fail(&self) -> bool {
-        self.has_fail.load(Ordering::SeqCst)
-    }
-
     fn completion_message(&self) {
         // No-op
     }

crates/lib/src/cli/json.rs

@@ -4,7 +4,7 @@ use crate::core::{config::FluffConfig, linter::linted_file::LintedFile};
 
 use super::{
     formatters::Formatter,
-    json_types::{Diagnostic, DiagnosticCollection, DiagnosticSeverity},
+    json_types::{Diagnostic, DiagnosticCollection},
 };
 
 #[derive(Default)]
@@ -24,14 +24,6 @@ impl Formatter for JsonFormatter {
         );
     }
 
-    fn has_fail(&self) -> bool {
-        let lock = self.violations.lock().unwrap();
-        lock.values().any(|v| {
-            v.iter()
-                .any(|d| matches!(&d.severity, DiagnosticSeverity::Warning))
-        })
-    }
-
     fn completion_message(&self) {
         let lock = self.violations.lock().unwrap();
         let json = serde_json::to_string(&*lock).unwrap();

crates/lib/src/core/linter/linted_file.rs

@@ -17,6 +17,10 @@ pub struct LintedFile {
 }
 
 impl LintedFile {
+    pub fn has_violations(&self) -> bool {
+        !self.violations.is_empty()
+    }
+
     pub fn get_violations(&self, is_fixable: Option<bool>) -> Vec<SQLBaseError> {
         if let Some(is_fixable) = is_fixable {
             self.violations

crates/lib/src/core/linter/linting_result.rs

@@ -16,6 +16,10 @@ impl LintingResult {
         LintingResult { files: vec![] }
     }
 
+    pub fn has_violations(&self) -> bool {
+        self.files.iter().any(|file| file.has_violations())
+    }
+
     /// Add a new `LintedDir` to this result.
     pub fn add(&mut self, path: LintedFile) -> usize {
         let idx = self.files.len();