Fmt

rust-lang · MarcusGrass · Feb 23, 2024 · Feb 23, 2024 · Feb 25, 2024 · Feb 25, 2024
commit b1e1cd477abf6c8aa346fd62cba44a19e69eac7c
diff --git a/src/formatting.rs b/src/formatting.rs
@@ -17,7 +17,10 @@ use crate::parse::session::ParseSess;
 use crate::print::Printer;
 use crate::utils::{contains_skip, count_newlines};
 use crate::visitor::FmtVisitor;
-use crate::{buf_eprintln, modules, source_file, ErrorKind, FormatReport, Input, Session, buf_println, buf_print};
+use crate::{
+    buf_eprintln, buf_print, buf_println, modules, source_file, ErrorKind, FormatReport, Input,
+    Session,
+};
 
 mod generated;
 mod newline_style;
@@ -44,7 +47,7 @@ impl<'b, T: Write + 'b> Session<'b, T> {
                         // Echo back stdin
                         buf_print!(self.printer, "{buf}");
                         Ok(FormatReport::new())
-                    },
+                    }
                     _ => Ok(FormatReport::new()),
                 };
             }
@@ -151,13 +154,19 @@ fn format_project<T: FormatHandler>(
     for (path, module) in files {
         if input_is_stdin && contains_skip(module.attrs()) {
             // Echo back stdin
-            buf_print!(printer, "{}", context
+            buf_print!(
+                printer,
+                "{}",
+                context
                     .parse_session
                     .snippet_provider(module.span)
-                    .entire_snippet());
+                    .entire_snippet()
+            );
             return Ok(FormatReport::new());
         }
-        should_emit_verbose(input_is_stdin, config, || buf_println!(printer, "Formatting {}", path));
+        should_emit_verbose(input_is_stdin, config, || {
+            buf_println!(printer, "Formatting {}", path)
+        });
         context.format_file(path, &module, is_macro_def)?;
     }
     timer = timer.done_formatting();

diff --git a/src/parse/session.rs b/src/parse/session.rs
@@ -134,10 +134,10 @@ fn default_dcx(
             rustc_driver::DEFAULT_LOCALE_RESOURCES.to_vec(),
             false,
         );
-        Box::new(EmitterWriter::new(
-            Box::new(printer.clone()),
-            fallback_bundle,
-        ).sm(Some(source_map.clone())))
+        Box::new(
+            EmitterWriter::new(Box::new(printer.clone()), fallback_bundle)
+                .sm(Some(source_map.clone())),
+        )
     };
     DiagCtxt::with_emitter(Box::new(SilentOnIgnoredFilesEmitter {
         has_non_ignorable_parser_errors: false,

diff --git a/src/print.rs b/src/print.rs
@@ -1,6 +1,6 @@
-use std::fmt::Formatter;
 use crate::Color;
 use rustc_errors::{Color as RustColor, ColorSpec, WriteColor};
+use std::fmt::Formatter;
 use std::io::{stderr, stdout, Write};
 use std::sync::{Arc, Mutex};
 use termcolor::{ColorChoice, StandardStream, WriteColor as _};
@@ -34,7 +34,6 @@ impl Write for Printer {
         //println!("Flush");
         Ok(())
     }
-
 }
 
 impl WriteColor for Printer {
@@ -54,7 +53,6 @@ impl WriteColor for Printer {
         self.inner.lock().unwrap().current_color.take();
         Ok(())
     }
-
 }
 
 struct PrinterInner {
@@ -223,18 +221,24 @@ pub enum PrintMessage {
 impl std::fmt::Debug for PrintMessage {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
-            PrintMessage::Stdout(buf) => {
-                f.write_fmt(format_args!("PrintMessage::Stdout({:?})", core::str::from_utf8(buf)))
-            }
-            PrintMessage::StdErr(buf) => {
-                f.write_fmt(format_args!("PrintMessage::Stderr({:?})", core::str::from_utf8(buf)))
-            }
-            PrintMessage::Term(msg) => {
-                f.write_fmt(format_args!("PrintMessage::Term({:?}, {:?})", core::str::from_utf8(&msg.message), msg.color))
-            }
-            PrintMessage::RustcErrTerm(msg) => {
-                f.write_fmt(format_args!("PrintMessage::RustcErrTerm({:?}, {:?})", core::str::from_utf8(&msg.message), msg.color))
-            }
+            PrintMessage::Stdout(buf) => f.write_fmt(format_args!(
+                "PrintMessage::Stdout({:?})",
+                core::str::from_utf8(buf)
+            )),
+            PrintMessage::StdErr(buf) => f.write_fmt(format_args!(
+                "PrintMessage::Stderr({:?})",
+                core::str::from_utf8(buf)
+            )),
+            PrintMessage::Term(msg) => f.write_fmt(format_args!(
+                "PrintMessage::Term({:?}, {:?})",
+                core::str::from_utf8(&msg.message),
+                msg.color
+            )),
+            PrintMessage::RustcErrTerm(msg) => f.write_fmt(format_args!(
+                "PrintMessage::RustcErrTerm({:?}, {:?})",
+                core::str::from_utf8(&msg.message),
+                msg.color
+            )),
         }
     }
 }