Merge pull request #127 from epage/per

fix(wincon)!: Make styled output stateless

crates/anstream/benches/stream.rs

@@ -37,8 +37,7 @@ fn stream(c: &mut Criterion) {
         group.bench_function("WinconStream", |b| {
             b.iter(|| {
                 let buffer = anstream::Buffer::with_capacity(content.len());
-                let mut stream =
-                    anstream::WinconStream::new(anstyle_wincon::Console::new(buffer).unwrap());
+                let mut stream = anstream::WinconStream::new(buffer);
 
                 stream.write_all(content).unwrap();
 

crates/anstream/src/auto.rs

@@ -102,9 +102,8 @@ where
     fn wincon(raw: S) -> Result<Self, S> {
         #[cfg(all(windows, feature = "wincon"))]
         {
-            let console = anstyle_wincon::Console::new(raw)?;
             Ok(Self {
-                inner: StreamInner::Wincon(WinconStream::new(console)),
+                inner: StreamInner::Wincon(WinconStream::new(raw)),
             })
         }
         #[cfg(not(all(windows, feature = "wincon")))]
@@ -120,7 +119,7 @@ where
             StreamInner::PassThrough(w) => w,
             StreamInner::Strip(w) => w.into_inner(),
             #[cfg(all(windows, feature = "wincon"))]
-            StreamInner::Wincon(w) => w.into_inner().into_inner(),
+            StreamInner::Wincon(w) => w.into_inner(),
         }
     }
 

crates/anstream/src/buffer.rs

@@ -50,28 +50,12 @@ impl std::io::Write for Buffer {
 
 #[cfg(all(windows, feature = "wincon"))]
 impl anstyle_wincon::WinconStream for Buffer {
-    fn set_colors(
+    fn write_colored(
         &mut self,
         fg: Option<anstyle::AnsiColor>,
         bg: Option<anstyle::AnsiColor>,
-    ) -> std::io::Result<()> {
-        use std::io::Write as _;
-
-        if let Some(fg) = fg {
-            write!(self, "{}", fg.render_fg())?;
-        }
-        if let Some(bg) = bg {
-            write!(self, "{}", bg.render_bg())?;
-        }
-        if fg.is_none() && bg.is_none() {
-            write!(self, "{}", anstyle::Reset.render())?;
-        }
-        Ok(())
-    }
-
-    fn get_colors(
-        &self,
-    ) -> std::io::Result<(Option<anstyle::AnsiColor>, Option<anstyle::AnsiColor>)> {
-        Ok((None, None))
+        data: &[u8],
+    ) -> std::io::Result<usize> {
+        self.0.write_colored(fg, bg, data)
     }
 }

crates/anstream/src/is_terminal.rs

@@ -30,38 +30,6 @@ impl IsTerminal for std::io::StderrLock<'static> {
     }
 }
 
-#[cfg(all(windows, feature = "wincon"))]
-impl IsTerminal for anstyle_wincon::Console<std::io::Stdout> {
-    #[inline]
-    fn is_terminal(&self) -> bool {
-        self.is_terminal()
-    }
-}
-
-#[cfg(all(windows, feature = "wincon"))]
-impl IsTerminal for anstyle_wincon::Console<std::io::StdoutLock<'static>> {
-    #[inline]
-    fn is_terminal(&self) -> bool {
-        self.is_terminal()
-    }
-}
-
-#[cfg(all(windows, feature = "wincon"))]
-impl IsTerminal for anstyle_wincon::Console<std::io::Stderr> {
-    #[inline]
-    fn is_terminal(&self) -> bool {
-        self.is_terminal()
-    }
-}
-
-#[cfg(all(windows, feature = "wincon"))]
-impl IsTerminal for anstyle_wincon::Console<std::io::StderrLock<'static>> {
-    #[inline]
-    fn is_terminal(&self) -> bool {
-        self.is_terminal()
-    }
-}
-
 impl IsTerminal for std::fs::File {
     #[inline]
     fn is_terminal(&self) -> bool {

crates/anstream/src/lockable.rs

@@ -29,23 +29,3 @@ impl Lockable for std::io::Stderr {
         (&self).lock()
     }
 }
-
-#[cfg(all(windows, feature = "wincon"))]
-impl Lockable for anstyle_wincon::Console<std::io::Stdout> {
-    type Locked = anstyle_wincon::Console<std::io::StdoutLock<'static>>;
-
-    #[inline]
-    fn lock(self) -> Self::Locked {
-        self.lock()
-    }
-}
-
-#[cfg(all(windows, feature = "wincon"))]
-impl Lockable for anstyle_wincon::Console<std::io::Stderr> {
-    type Locked = anstyle_wincon::Console<std::io::StderrLock<'static>>;
-
-    #[inline]
-    fn lock(self) -> Self::Locked {
-        self.lock()
-    }
-}

crates/anstream/src/wincon.rs

@@ -10,7 +10,7 @@ pub struct WinconStream<S>
 where
     S: RawStream,
 {
-    console: anstyle_wincon::Console<S>,
+    raw: S,
     // `WinconBytes` is especially large compared to other variants of `AutoStream`, so boxing it
     // here so `AutoStream` doesn't have to discard one allocation and create another one when
     // calling `AutoStream::lock`
@@ -23,24 +23,22 @@ where
 {
     /// Only pass printable data to the inner `Write`
     #[inline]
-    pub fn new(console: anstyle_wincon::Console<S>) -> Self {
+    pub fn new(raw: S) -> Self {
         Self {
-            console,
+            raw,
             state: Box::default(),
         }
     }
 
     /// Get the wrapped [`RawStream`]
     #[inline]
-    pub fn into_inner(self) -> anstyle_wincon::Console<S> {
-        self.console
+    pub fn into_inner(self) -> S {
+        self.raw
     }
 
     #[inline]
     pub fn is_terminal(&self) -> bool {
-        // HACK: We can't get the console's stream to check but if there is a console, it likely is
-        // a terminal
-        true
+        self.raw.is_terminal()
     }
 }
 
@@ -62,7 +60,7 @@ where
         for (style, printable) in self.state.extract_next(buf) {
             let fg = style.get_fg_color().and_then(cap_wincon_color);
             let bg = style.get_bg_color().and_then(cap_wincon_color);
-            let written = self.console.write(fg, bg, printable.as_bytes())?;
+            let written = self.raw.write_colored(fg, bg, printable.as_bytes())?;
             let possible = printable.len();
             if possible != written {
                 // HACK: Unsupported atm
@@ -73,7 +71,7 @@ where
     }
     #[inline]
     fn flush(&mut self) -> std::io::Result<()> {
-        self.console.flush()
+        self.raw.flush()
     }
 }
 
@@ -83,7 +81,7 @@ impl Lockable for WinconStream<std::io::Stdout> {
     #[inline]
     fn lock(self) -> Self::Locked {
         Self::Locked {
-            console: self.console.lock(),
+            raw: self.raw.lock(),
             state: self.state,
         }
     }
@@ -95,7 +93,7 @@ impl Lockable for WinconStream<std::io::Stderr> {
     #[inline]
     fn lock(self) -> Self::Locked {
         Self::Locked {
-            console: self.console.lock(),
+            raw: self.raw.lock(),
             state: self.state,
         }
     }
@@ -120,9 +118,9 @@ mod test {
         #[cfg_attr(miri, ignore)]  // See https://github.com/AltSysrq/proptest/issues/253
         fn write_all_no_escapes(s in "\\PC*") {
             let buffer = crate::Buffer::new();
-            let mut stream = WinconStream::new(anstyle_wincon::Console::new(buffer).unwrap());
+            let mut stream = WinconStream::new(buffer);
             stream.write_all(s.as_bytes()).unwrap();
-            let buffer = stream.into_inner().into_inner();
+            let buffer = stream.into_inner();
             let actual = std::str::from_utf8(buffer.as_ref()).unwrap();
             assert_eq!(s, actual);
         }
@@ -131,11 +129,11 @@ mod test {
         #[cfg_attr(miri, ignore)]  // See https://github.com/AltSysrq/proptest/issues/253
         fn write_byte_no_escapes(s in "\\PC*") {
             let buffer = crate::Buffer::new();
-            let mut stream = WinconStream::new(anstyle_wincon::Console::new(buffer).unwrap());
+            let mut stream = WinconStream::new(buffer);
             for byte in s.as_bytes() {
                 stream.write_all(&[*byte]).unwrap();
             }
-            let buffer = stream.into_inner().into_inner();
+            let buffer = stream.into_inner();
             let actual = std::str::from_utf8(buffer.as_ref()).unwrap();
             assert_eq!(s, actual);
         }
@@ -144,15 +142,15 @@ mod test {
         #[cfg_attr(miri, ignore)]  // See https://github.com/AltSysrq/proptest/issues/253
         fn write_all_random(s in any::<Vec<u8>>()) {
             let buffer = crate::Buffer::new();
-            let mut stream = WinconStream::new(anstyle_wincon::Console::new(buffer).unwrap());
+            let mut stream = WinconStream::new(buffer);
             stream.write_all(s.as_slice()).unwrap();
         }
 
         #[test]
         #[cfg_attr(miri, ignore)]  // See https://github.com/AltSysrq/proptest/issues/253
         fn write_byte_random(s in any::<Vec<u8>>()) {
             let buffer = crate::Buffer::new();
-            let mut stream = WinconStream::new(anstyle_wincon::Console::new(buffer).unwrap());
+            let mut stream = WinconStream::new(buffer);
             for byte in s.as_slice() {
                 stream.write_all(&[*byte]).unwrap();
             }

crates/anstyle-wincon/examples/dump.rs

@@ -1,32 +1,33 @@
+use anstyle_wincon::WinconStream as _;
+
 fn main() -> Result<(), lexopt::Error> {
     let args = Args::parse()?;
     let stdout = std::io::stdout();
-    let mut stdout = anstyle_wincon::Console::new(stdout.lock())
-        .map_err(|_err| lexopt::Error::from("could not open `stdout` for color control"))?;
+    let mut stdout = stdout.lock();
 
     for fixed in 0..16 {
         let style = style(fixed, args.layer, args.effects);
         let _ = print_number(&mut stdout, fixed, style);
         if fixed == 7 || fixed == 15 {
-            let _ = stdout.write(None, None, &b"\n"[..]);
+            let _ = stdout.write_colored(None, None, &b"\n"[..]);
         }
     }
 
     for r in 0..6 {
-        let _ = stdout.write(None, None, &b"\n"[..]);
+        let _ = stdout.write_colored(None, None, &b"\n"[..]);
         for g in 0..6 {
             for b in 0..6 {
                 let fixed = r * 36 + g * 6 + b + 16;
                 let style = style(fixed, args.layer, args.effects);
                 let _ = print_number(&mut stdout, fixed, style);
             }
-            let _ = stdout.write(None, None, &b"\n"[..]);
+            let _ = stdout.write_colored(None, None, &b"\n"[..]);
         }
     }
 
     for c in 0..24 {
         if 0 == c % 8 {
-            let _ = stdout.write(None, None, &b"\n"[..]);
+            let _ = stdout.write_colored(None, None, &b"\n"[..]);
         }
         let fixed = 232 + c;
         let style = style(fixed, args.layer, args.effects);
@@ -46,7 +47,7 @@ fn style(fixed: u8, layer: Layer, effects: anstyle::Effects) -> anstyle::Style {
 }
 
 fn print_number(
-    stdout: &mut anstyle_wincon::Console<std::io::StdoutLock<'static>>,
+    stdout: &mut std::io::StdoutLock<'static>,
     fixed: u8,
     style: anstyle::Style,
 ) -> std::io::Result<()> {
@@ -62,7 +63,7 @@ fn print_number(
     });
 
     stdout
-        .write(fg, bg, format!("{:>4}", fixed).as_bytes())
+        .write_colored(fg, bg, format!("{:>4}", fixed).as_bytes())
         .map(|_| ())
 }
 

crates/anstyle-wincon/examples/set.rs

@@ -7,15 +7,16 @@ fn main() {
 
 #[cfg(windows)]
 fn main() -> Result<(), lexopt::Error> {
+    use anstyle_wincon::WinconStream as _;
+
     let args = Args::parse()?;
     let stdout = std::io::stdout();
-    let mut stdout = anstyle_wincon::Console::new(stdout.lock())
-        .map_err(|_err| lexopt::Error::from("could not open `stdout` for color control"))?;
+    let mut stdout = stdout.lock();
 
     let fg = args.fg.and_then(|c| c.into_ansi());
     let bg = args.bg.and_then(|c| c.into_ansi());
 
-    let _ = stdout.write(fg, bg, "".as_bytes());
+    let _ = stdout.write_colored(fg, bg, "".as_bytes());
 
     std::mem::forget(stdout);
 

crates/anstyle-wincon/src/ansi.rs

@@ -0,0 +1,25 @@
+//! Low-level ANSI-styling
+
+/// Write ANSI colored text to the stream
+pub fn write_colored<S: std::io::Write>(
+    stream: &mut S,
+    fg: Option<anstyle::AnsiColor>,
+    bg: Option<anstyle::AnsiColor>,
+    data: &[u8],
+) -> std::io::Result<usize> {
+    let non_default = fg.is_some() || bg.is_some();
+
+    if non_default {
+        if let Some(fg) = fg {
+            write!(stream, "{}", fg.render_fg())?;
+        }
+        if let Some(bg) = bg {
+            write!(stream, "{}", bg.render_bg())?;
+        }
+    }
+    let written = stream.write(data)?;
+    if non_default {
+        write!(stream, "{}", anstyle::Reset.render())?;
+    }
+    Ok(written)
+}