Emitters dont print

rust-lang · MarcusGrass · Feb 23, 2024 · Feb 23, 2024 · Feb 25, 2024 · Feb 25, 2024
commit 4496f286849d4094cc245823cc07f8ef3a325d92
diff --git a/src/emitter.rs b/src/emitter.rs
@@ -8,6 +8,7 @@ pub(crate) use self::stdout::*;
 use crate::FileName;
 use std::io::{self, Write};
 use std::path::Path;
+use crate::print::Printer;
 
 mod checkstyle;
 mod diff;
@@ -32,6 +33,7 @@ pub(crate) trait Emitter {
     fn emit_formatted_file(
         &mut self,
         output: &mut dyn Write,
+        printer: &Printer,
         formatted_file: FormattedFile<'_>,
     ) -> Result<EmitterResult, io::Error>;
 

diff --git a/src/emitter/checkstyle.rs b/src/emitter/checkstyle.rs
@@ -21,6 +21,7 @@ impl Emitter for CheckstyleEmitter {
     fn emit_formatted_file(
         &mut self,
         output: &mut dyn Write,
+        _printer: &Printer,
         FormattedFile {
             filename,
             original_text,

diff --git a/src/emitter/diff.rs b/src/emitter/diff.rs
@@ -16,6 +16,7 @@ impl Emitter for DiffEmitter {
     fn emit_formatted_file(
         &mut self,
         output: &mut dyn Write,
+        printer: &Printer,
         FormattedFile {
             filename,
             original_text,
@@ -34,6 +35,7 @@ impl Emitter for DiffEmitter {
                     mismatch,
                     |line_num| format!("Diff in {}:{}:", filename, line_num),
                     &self.config,
+                    printer,
                 );
             }
         } else if original_text != formatted_text {

diff --git a/src/emitter/files.rs b/src/emitter/files.rs
@@ -1,5 +1,6 @@
 use super::*;
 use std::fs;
+use crate::buf_println;
 
 #[derive(Debug, Default)]
 pub(crate) struct FilesEmitter {
@@ -17,7 +18,8 @@ impl FilesEmitter {
 impl Emitter for FilesEmitter {
     fn emit_formatted_file(
         &mut self,
-        output: &mut dyn Write,
+        _output: &mut dyn Write,
+        printer: &Printer,
         FormattedFile {
             filename,
             original_text,
@@ -29,7 +31,7 @@ impl Emitter for FilesEmitter {
         if original_text != formatted_text {
             fs::write(filename, formatted_text)?;
             if self.print_misformatted_file_names {
-                writeln!(output, "{}", filename.display())?;
+                buf_println!(printer, "{}", filename.display());
             }
         }
         Ok(EmitterResult::default())

diff --git a/src/emitter/files_with_backup.rs b/src/emitter/files_with_backup.rs
@@ -8,6 +8,7 @@ impl Emitter for FilesWithBackupEmitter {
     fn emit_formatted_file(
         &mut self,
         _output: &mut dyn Write,
+        _printer: &Printer,
         FormattedFile {
             filename,
             original_text,

diff --git a/src/emitter/json.rs b/src/emitter/json.rs
@@ -32,6 +32,7 @@ impl Emitter for JsonEmitter {
     fn emit_formatted_file(
         &mut self,
         _output: &mut dyn Write,
+        _printer: &Printer,
         FormattedFile {
             filename,
             original_text,

diff --git a/src/emitter/modified_lines.rs b/src/emitter/modified_lines.rs
@@ -8,6 +8,7 @@ impl Emitter for ModifiedLinesEmitter {
     fn emit_formatted_file(
         &mut self,
         output: &mut dyn Write,
+        _printer: &Printer,
         FormattedFile {
             original_text,
             formatted_text,

diff --git a/src/emitter/stdout.rs b/src/emitter/stdout.rs
@@ -1,3 +1,4 @@
+use crate::buf_println;
 use super::*;
 use crate::config::Verbosity;
 
@@ -15,17 +16,18 @@ impl StdoutEmitter {
 impl Emitter for StdoutEmitter {
     fn emit_formatted_file(
         &mut self,
-        output: &mut dyn Write,
+        _output: &mut dyn Write,
+        printer: &Printer,
         FormattedFile {
             filename,
             formatted_text,
             ..
         }: FormattedFile<'_>,
     ) -> Result<EmitterResult, io::Error> {
         if self.verbosity != Verbosity::Quiet {
-            writeln!(output, "{filename}:\n")?;
+            buf_println!(printer, "{filename}:\n");
         }
-        write!(output, "{formatted_text}")?;
+        buf_println!(printer, "{formatted_text}");
         Ok(EmitterResult::default())
     }
 }
diff --git a/src/formatting.rs b/src/formatting.rs
@@ -298,6 +298,7 @@ impl<'b, T: Write + 'b> FormatHandler for Session<'b, T> {
                 out,
                 &mut *self.emitter,
                 self.config.newline_style(),
+                self.printer,
             ) {
                 Ok(ref result) if result.has_diff => report.add_diff(),
                 Err(e) => {

diff --git a/src/source_file.rs b/src/source_file.rs
@@ -15,6 +15,7 @@ use crate::create_emitter;
 use crate::formatting::FileRecord;
 
 use rustc_data_structures::sync::Lrc;
+use crate::print::Printer;
 
 // Append a newline to the end of each file.
 pub(crate) fn append_newline(s: &mut String) {
@@ -55,6 +56,7 @@ pub(crate) fn write_file<T>(
     out: &mut T,
     emitter: &mut dyn Emitter,
     newline_style: NewlineStyle,
+    printer: &Printer,
 ) -> Result<emitter::EmitterResult, io::Error>
 where
     T: Write,
@@ -101,5 +103,5 @@ where
         formatted_text,
     };
 
-    emitter.emit_formatted_file(out, formatted_file)
+    emitter.emit_formatted_file(out, printer, formatted_file)
 }