diff options
Diffstat (limited to '')
-rw-r--r-- | vendor/nu-ansi-term/src/write.rs (renamed from vendor/ansi_term/src/write.rs) | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/vendor/ansi_term/src/write.rs b/vendor/nu-ansi-term/src/write.rs index 65a64feb2..552771918 100644 --- a/vendor/ansi_term/src/write.rs +++ b/vendor/nu-ansi-term/src/write.rs @@ -1,40 +1,37 @@ use std::fmt; use std::io; - pub trait AnyWrite { - type wstr: ?Sized; + type Wstr: ?Sized; type Error; fn write_fmt(&mut self, fmt: fmt::Arguments) -> Result<(), Self::Error>; - fn write_str(&mut self, s: &Self::wstr) -> Result<(), Self::Error>; + fn write_str(&mut self, s: &Self::Wstr) -> Result<(), Self::Error>; } - -impl<'a> AnyWrite for fmt::Write + 'a { - type wstr = str; +impl<'a> AnyWrite for dyn fmt::Write + 'a { + type Wstr = str; type Error = fmt::Error; fn write_fmt(&mut self, fmt: fmt::Arguments) -> Result<(), Self::Error> { fmt::Write::write_fmt(self, fmt) } - fn write_str(&mut self, s: &Self::wstr) -> Result<(), Self::Error> { + fn write_str(&mut self, s: &Self::Wstr) -> Result<(), Self::Error> { fmt::Write::write_str(self, s) } } - -impl<'a> AnyWrite for io::Write + 'a { - type wstr = [u8]; +impl<'a> AnyWrite for dyn io::Write + 'a { + type Wstr = [u8]; type Error = io::Error; fn write_fmt(&mut self, fmt: fmt::Arguments) -> Result<(), Self::Error> { io::Write::write_fmt(self, fmt) } - fn write_str(&mut self, s: &Self::wstr) -> Result<(), Self::Error> { + fn write_str(&mut self, s: &Self::Wstr) -> Result<(), Self::Error> { io::Write::write_all(self, s) } } |