Clean up a bit more

rust-lang · MarcusGrass · Feb 23, 2024 · Feb 23, 2024 · Feb 25, 2024 · Feb 25, 2024
commit eb78a340a0c377715d89e37bb140c947167f09a3
diff --git a/src/emitter/files.rs b/src/emitter/files.rs
@@ -1,24 +1,23 @@
 use super::*;
-use crate::buf_println;
 use std::fs;
 
 #[derive(Default)]
-pub(crate) struct FilesEmitter<'a> {
-    print_misformatted_file_names: Option<&'a Printer>,
+pub(crate) struct FilesEmitter {
+    print_misformatted_file_names: bool,
 }
 
-impl<'a> FilesEmitter<'a> {
-    pub(crate) fn new(print_misformatted_file_names: Option<&'a Printer>) -> Self {
+impl FilesEmitter {
+    pub(crate) fn new(print_misformatted_file_names: bool) -> Self {
         Self {
             print_misformatted_file_names,
         }
     }
 }
 
-impl<'a> Emitter for FilesEmitter<'a> {
+impl Emitter for FilesEmitter {
     fn emit_formatted_file(
         &mut self,
-        _output: &mut dyn Write,
+        output: &mut dyn Write,
         FormattedFile {
             filename,
             original_text,
@@ -29,8 +28,8 @@ impl<'a> Emitter for FilesEmitter<'a> {
         let filename = ensure_real_path(filename);
         if original_text != formatted_text {
             fs::write(filename, formatted_text)?;
-            if let Some(printer) = self.print_misformatted_file_names {
-                buf_println!(printer, "{}", filename.display());
+            if self.print_misformatted_file_names {
+                writeln!(output, "{}", filename.display())?;
             }
         }
         Ok(EmitterResult::default())

diff --git a/src/lib.rs b/src/lib.rs
@@ -529,7 +529,7 @@ pub(crate) fn create_emitter<'a>(config: &Config, printer: &'a Printer) -> Box<d
             Box::new(emitter::FilesWithBackupEmitter::default())
         }
         EmitMode::Files => Box::new(emitter::FilesEmitter::new(
-            config.print_misformatted_file_names().then_some(printer),
+            config.print_misformatted_file_names(),
         )),
         EmitMode::Stdout | EmitMode::Coverage => {
             Box::new(emitter::IntoOutputEmitter::new(config.verbose()))

diff --git a/src/parse/session.rs b/src/parse/session.rs
@@ -124,7 +124,6 @@ fn default_dcx(
     ignore_path_set: Lrc<IgnorePathSet>,
     can_reset: Lrc<AtomicBool>,
     show_parse_errors: bool,
-    _color: Color,
     printer: &Printer,
 ) -> DiagCtxt {
     let emitter = if !show_parse_errors {
@@ -162,7 +161,6 @@ impl ParseSess {
             Lrc::clone(&ignore_path_set),
             Lrc::clone(&can_reset_errors),
             config.show_parse_errors(),
-            config.color(),
             printer,
         );
         let parse_sess = RawParseSess::with_dcx(dcx, source_map);