Merge pull request #223 from DaniPopes/raw-stream-refmut

refactor: Implement `RawStream` for `&mut T` and `Box<T>` generically

Author: epage

crates/anstream/src/buffer.rs

@@ -54,15 +54,3 @@ impl anstyle_wincon::WinconStream for Buffer {
         self.0.write_colored(fg, bg, data)
     }
 }
-
-#[cfg(all(windows, feature = "wincon"))]
-impl anstyle_wincon::WinconStream for &'_ mut Buffer {
-    fn write_colored(
-        &mut self,
-        fg: Option<anstyle::AnsiColor>,
-        bg: Option<anstyle::AnsiColor>,
-        data: &[u8],
-    ) -> std::io::Result<usize> {
-        (**self).write_colored(fg, bg, data)
-    }
-}

crates/anstream/src/stream.rs

@@ -11,92 +11,82 @@ pub trait RawStream:
 {
 }
 
+impl<T: RawStream + ?Sized> RawStream for &mut T {}
+impl<T: RawStream + ?Sized> RawStream for Box<T> {}
+
 impl RawStream for std::io::Stdout {}
 
 impl RawStream for std::io::StdoutLock<'_> {}
 
-impl RawStream for &'_ mut std::io::StdoutLock<'_> {}
-
 impl RawStream for std::io::Stderr {}
 
 impl RawStream for std::io::StderrLock<'_> {}
 
-impl RawStream for &'_ mut std::io::StderrLock<'_> {}
-
-impl RawStream for Box<dyn std::io::Write> {}
-
-impl RawStream for &'_ mut Box<dyn std::io::Write> {}
+impl RawStream for dyn std::io::Write {}
 
 impl RawStream for Vec<u8> {}
 
-impl RawStream for &'_ mut Vec<u8> {}
-
 impl RawStream for std::fs::File {}
 
-impl RawStream for &'_ mut std::fs::File {}
-
 #[allow(deprecated)]
 impl RawStream for crate::Buffer {}
 
-#[allow(deprecated)]
-impl RawStream for &'_ mut crate::Buffer {}
-
 /// Trait to determine if a descriptor/handle refers to a terminal/tty.
 pub trait IsTerminal: private::Sealed {
     /// Returns `true` if the descriptor/handle refers to a terminal/tty.
     fn is_terminal(&self) -> bool;
 }
 
-impl IsTerminal for std::io::Stdout {
+impl<T: IsTerminal + ?Sized> IsTerminal for &T {
     #[inline]
     fn is_terminal(&self) -> bool {
-        is_terminal_polyfill::IsTerminal::is_terminal(self)
+        (**self).is_terminal()
     }
 }
 
-impl IsTerminal for std::io::StdoutLock<'_> {
+impl<T: IsTerminal + ?Sized> IsTerminal for &mut T {
     #[inline]
     fn is_terminal(&self) -> bool {
-        is_terminal_polyfill::IsTerminal::is_terminal(self)
+        (**self).is_terminal()
     }
 }
 
-impl IsTerminal for &'_ mut std::io::StdoutLock<'_> {
+impl<T: IsTerminal + ?Sized> IsTerminal for Box<T> {
     #[inline]
     fn is_terminal(&self) -> bool {
         (**self).is_terminal()
     }
 }
 
-impl IsTerminal for std::io::Stderr {
+impl IsTerminal for std::io::Stdout {
     #[inline]
     fn is_terminal(&self) -> bool {
         is_terminal_polyfill::IsTerminal::is_terminal(self)
     }
 }
 
-impl IsTerminal for std::io::StderrLock<'_> {
+impl IsTerminal for std::io::StdoutLock<'_> {
     #[inline]
     fn is_terminal(&self) -> bool {
         is_terminal_polyfill::IsTerminal::is_terminal(self)
     }
 }
 
-impl IsTerminal for &'_ mut std::io::StderrLock<'_> {
+impl IsTerminal for std::io::Stderr {
     #[inline]
     fn is_terminal(&self) -> bool {
-        (**self).is_terminal()
+        is_terminal_polyfill::IsTerminal::is_terminal(self)
     }
 }
 
-impl IsTerminal for Box<dyn std::io::Write> {
+impl IsTerminal for std::io::StderrLock<'_> {
     #[inline]
     fn is_terminal(&self) -> bool {
-        false
+        is_terminal_polyfill::IsTerminal::is_terminal(self)
     }
 }
 
-impl IsTerminal for &'_ mut Box<dyn std::io::Write> {
+impl IsTerminal for dyn std::io::Write {
     #[inline]
     fn is_terminal(&self) -> bool {
         false
@@ -110,27 +100,13 @@ impl IsTerminal for Vec<u8> {
     }
 }
 
-impl IsTerminal for &'_ mut Vec<u8> {
-    #[inline]
-    fn is_terminal(&self) -> bool {
-        false
-    }
-}
-
 impl IsTerminal for std::fs::File {
     #[inline]
     fn is_terminal(&self) -> bool {
         is_terminal_polyfill::IsTerminal::is_terminal(self)
     }
 }
 
-impl IsTerminal for &'_ mut std::fs::File {
-    #[inline]
-    fn is_terminal(&self) -> bool {
-        (**self).is_terminal()
-    }
-}
-
 #[allow(deprecated)]
 impl IsTerminal for crate::Buffer {
     #[inline]
@@ -139,14 +115,6 @@ impl IsTerminal for crate::Buffer {
     }
 }
 
-#[allow(deprecated)]
-impl IsTerminal for &'_ mut crate::Buffer {
-    #[inline]
-    fn is_terminal(&self) -> bool {
-        (**self).is_terminal()
-    }
-}
-
 /// Lock a stream
 pub trait AsLockedWrite: private::Sealed {
     /// Locked writer type
@@ -194,7 +162,7 @@ impl AsLockedWrite for std::io::StderrLock<'static> {
     }
 }
 
-impl AsLockedWrite for Box<dyn std::io::Write> {
+impl AsLockedWrite for dyn std::io::Write {
     type Write<'w> = &'w mut Self;
 
     #[inline]
@@ -234,33 +202,24 @@ impl AsLockedWrite for crate::Buffer {
 mod private {
     pub trait Sealed {}
 
+    impl<T: Sealed + ?Sized> Sealed for &T {}
+    impl<T: Sealed + ?Sized> Sealed for &mut T {}
+    impl<T: Sealed + ?Sized> Sealed for Box<T> {}
+
     impl Sealed for std::io::Stdout {}
 
     impl Sealed for std::io::StdoutLock<'_> {}
 
-    impl Sealed for &'_ mut std::io::StdoutLock<'_> {}
-
     impl Sealed for std::io::Stderr {}
 
     impl Sealed for std::io::StderrLock<'_> {}
 
-    impl Sealed for &'_ mut std::io::StderrLock<'_> {}
-
-    impl Sealed for Box<dyn std::io::Write> {}
-
-    impl Sealed for &'_ mut Box<dyn std::io::Write> {}
+    impl Sealed for dyn std::io::Write {}
 
     impl Sealed for Vec<u8> {}
 
-    impl Sealed for &'_ mut Vec<u8> {}
-
     impl Sealed for std::fs::File {}
 
-    impl Sealed for &'_ mut std::fs::File {}
-
     #[allow(deprecated)]
     impl Sealed for crate::Buffer {}
-
-    #[allow(deprecated)]
-    impl Sealed for &'_ mut crate::Buffer {}
 }

crates/anstyle-wincon/src/ansi.rs

@@ -1,7 +1,7 @@
 //! Low-level ANSI-styling
 
 /// Write ANSI colored text to the stream
-pub fn write_colored<S: std::io::Write>(
+pub fn write_colored<S: std::io::Write + ?Sized>(
     stream: &mut S,
     fg: Option<anstyle::AnsiColor>,
     bg: Option<anstyle::AnsiColor>,

crates/anstyle-wincon/src/stream.rs

@@ -9,18 +9,18 @@ pub trait WinconStream {
     ) -> std::io::Result<usize>;
 }
 
-impl WinconStream for Box<dyn std::io::Write> {
+impl<T: WinconStream + ?Sized> WinconStream for &mut T {
     fn write_colored(
         &mut self,
         fg: Option<anstyle::AnsiColor>,
         bg: Option<anstyle::AnsiColor>,
         data: &[u8],
     ) -> std::io::Result<usize> {
-        crate::ansi::write_colored(self, fg, bg, data)
+        (**self).write_colored(fg, bg, data)
     }
 }
 
-impl WinconStream for &'_ mut Box<dyn std::io::Write> {
+impl<T: WinconStream + ?Sized> WinconStream for Box<T> {
     fn write_colored(
         &mut self,
         fg: Option<anstyle::AnsiColor>,
@@ -31,7 +31,7 @@ impl WinconStream for &'_ mut Box<dyn std::io::Write> {
     }
 }
 
-impl WinconStream for std::fs::File {
+impl WinconStream for dyn std::io::Write {
     fn write_colored(
         &mut self,
         fg: Option<anstyle::AnsiColor>,
@@ -42,14 +42,14 @@ impl WinconStream for std::fs::File {
     }
 }
 
-impl WinconStream for &'_ mut std::fs::File {
+impl WinconStream for std::fs::File {
     fn write_colored(
         &mut self,
         fg: Option<anstyle::AnsiColor>,
         bg: Option<anstyle::AnsiColor>,
         data: &[u8],
     ) -> std::io::Result<usize> {
-        (**self).write_colored(fg, bg, data)
+        crate::ansi::write_colored(self, fg, bg, data)
     }
 }
 
@@ -64,17 +64,6 @@ impl WinconStream for Vec<u8> {
     }
 }
 
-impl WinconStream for &'_ mut Vec<u8> {
-    fn write_colored(
-        &mut self,
-        fg: Option<anstyle::AnsiColor>,
-        bg: Option<anstyle::AnsiColor>,
-        data: &[u8],
-    ) -> std::io::Result<usize> {
-        (**self).write_colored(fg, bg, data)
-    }
-}
-
 impl WinconStream for std::io::Stdout {
     fn write_colored(
         &mut self,
@@ -150,25 +139,3 @@ mod platform {
         }
     }
 }
-
-impl WinconStream for &'_ mut std::io::StdoutLock<'_> {
-    fn write_colored(
-        &mut self,
-        fg: Option<anstyle::AnsiColor>,
-        bg: Option<anstyle::AnsiColor>,
-        data: &[u8],
-    ) -> std::io::Result<usize> {
-        (**self).write_colored(fg, bg, data)
-    }
-}
-
-impl WinconStream for &'_ mut std::io::StderrLock<'_> {
-    fn write_colored(
-        &mut self,
-        fg: Option<anstyle::AnsiColor>,
-        bg: Option<anstyle::AnsiColor>,
-        data: &[u8],
-    ) -> std::io::Result<usize> {
-        (**self).write_colored(fg, bg, data)
-    }
-}