Merge pull request #302 from Bobo1239/main

epage · web-flow · commit 489ba1886aab · 2024-01-26T21:46:17.000-06:00
fix(fmt): Fix passing of WriteStyle when using Target::Pipe
diff --git a/src/fmt/writer/buffer.rs b/src/fmt/writer/buffer.rs
@@ -31,10 +31,13 @@ impl BufferWriter {
         }
     }
 
-    pub(in crate::fmt::writer) fn pipe(pipe: Box<Mutex<dyn io::Write + Send + 'static>>) -> Self {
+    pub(in crate::fmt::writer) fn pipe(
+        pipe: Box<Mutex<dyn io::Write + Send + 'static>>,
+        write_style: WriteStyle,
+    ) -> Self {
         BufferWriter {
             target: WritableTarget::Pipe(pipe),
-            write_style: WriteStyle::Never,
+            write_style,
         }
     }
 
diff --git a/src/fmt/writer/mod.rs b/src/fmt/writer/mod.rs
@@ -138,7 +138,7 @@ impl Builder {
         let writer = match mem::take(&mut self.target) {
             Target::Stdout => BufferWriter::stdout(self.is_test, color_choice),
             Target::Stderr => BufferWriter::stderr(self.is_test, color_choice),
-            Target::Pipe(pipe) => BufferWriter::pipe(Box::new(Mutex::new(pipe))),
+            Target::Pipe(pipe) => BufferWriter::pipe(Box::new(Mutex::new(pipe)), color_choice),
         };
 
         Writer { inner: writer }

Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,13 @@ impl BufferWriter {`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`		`- pub(in crate::fmt::writer) fn pipe(pipe: Box<Mutex<dyn io::Write + Send + 'static>>) -> Self {`
	`34`	`+ pub(in crate::fmt::writer) fn pipe(`
	`35`	`+ pipe: Box<Mutex<dyn io::Write + Send + 'static>>,`
	`36`	`+ write_style: WriteStyle,`
	`37`	`+ ) -> Self {`
`35`	`38`	`BufferWriter {`
`36`	`39`	`target: WritableTarget::Pipe(pipe),`
`37`		`- write_style: WriteStyle::Never,`
	`40`	`+ write_style,`
`38`	`41`	`}`
`39`	`42`	`}`
`40`	`43`