perf!: faster printing (compact) (#225)

Author: beeb

crates/lintspec-core/src/lint.rs

@@ -61,38 +61,23 @@ pub struct ItemDiagnostics {
 impl ItemDiagnostics {
     /// Print the diagnostics for a single source item in a compact format
     ///
-    /// The writer `f` can be stderr or a file handle, for example. The path to the file containing this source item
-    /// should be provided, as well as the current working directory where the command was launched from. This last
-    /// information is used to compute the relative path when possible.
+    /// The writer `f` can be stderr or a file handle, for example. The `source_name` should be
+    /// the display name for the file (typically a relative path from the working directory).
     pub fn print_compact(
         &self,
         f: &mut impl io::Write,
-        path: impl AsRef<Path>,
-        root_dir: impl AsRef<Path>,
+        source_name: &str,
     ) -> std::result::Result<(), io::Error> {
-        fn inner(
-            this: &ItemDiagnostics,
-            f: &mut impl io::Write,
-            path: &Path,
-            root_dir: &Path,
-        ) -> std::result::Result<(), io::Error> {
-            let source_name = match path.strip_prefix(root_dir) {
-                Ok(relative_path) => relative_path.to_string_lossy(),
-                Err(_) => path.to_string_lossy(),
-            };
-            writeln!(f, "{source_name}:{}", this.span.start)?;
-            if let Some(parent) = &this.parent {
-                writeln!(f, "{} {}.{}", this.item_type, parent, this.name)?;
-            } else {
-                writeln!(f, "{} {}", this.item_type, this.name)?;
-            }
-            for diag in &this.diags {
-                writeln!(f, "  {}", diag.message)?;
-            }
-            writeln!(f)?;
-            Ok(())
+        writeln!(f, "{source_name}:{}", self.span.start)?;
+        if let Some(parent) = &self.parent {
+            writeln!(f, "{} {}.{}", self.item_type, parent, self.name)?;
+        } else {
+            writeln!(f, "{} {}", self.item_type, self.name)?;
+        }
+        for diag in &self.diags {
+            writeln!(f, "  {}", diag.message)?;
         }
-        inner(self, f, path.as_ref(), root_dir.as_ref())
+        writeln!(f)
     }
 }
 

crates/lintspec-core/tests/common.rs

@@ -75,8 +75,12 @@ pub fn print_reports(
         compact: bool,
     ) -> Result<(), io::Error> {
         if compact {
+            let source_name = match file_diags.path.strip_prefix(root_path) {
+                Ok(relative_path) => relative_path.to_string_lossy(),
+                Err(_) => file_diags.path.to_string_lossy(),
+            };
             for item_diags in file_diags.items {
-                item_diags.print_compact(f, &file_diags.path, root_path)?;
+                item_diags.print_compact(f, &source_name)?;
             }
         } else {
             let source_name = match file_diags.path.strip_prefix(root_path) {

crates/lintspec/src/cli.rs

@@ -523,8 +523,12 @@ pub fn print_reports(
         compact: bool,
     ) -> Result<(), io::Error> {
         if compact {
+            let source_name = match file_diags.path.strip_prefix(root_path) {
+                Ok(relative_path) => relative_path.to_string_lossy(),
+                Err(_) => file_diags.path.to_string_lossy(),
+            };
             for item_diags in file_diags.items {
-                item_diags.print_compact(f, &file_diags.path, root_path)?;
+                item_diags.print_compact(f, &source_name)?;
             }
         } else {
             let source_name = match file_diags.path.strip_prefix(root_path) {