twin/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-08-05 14:42:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

termcolor: 80 cols

Browse Source
This commit is contained in:
Andrew Gallant
2017-08-27 10:00:01 -04:00
parent 82d101907a
commit 5213bd30ea
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
termcolor/src/lib.rs
View File

@@ -202,15 +202,23 @@ enum IoStandardStream {
impl IoStandardStream { impl IoStandardStream {
fn new(sty: StandardStreamType) -> IoStandardStream { fn new(sty: StandardStreamType) -> IoStandardStream {
match sty { match sty {
StandardStreamType::Stdout => IoStandardStream::Stdout(io::stdout()), StandardStreamType::Stdout => {
StandardStreamType::Stderr => IoStandardStream::Stderr(io::stderr()), IoStandardStream::Stdout(io::stdout())
}
StandardStreamType::Stderr => {
IoStandardStream::Stderr(io::stderr())
}
} }
} }
fn lock(&self) -> IoStandardStreamLock { fn lock(&self) -> IoStandardStreamLock {
match *self { match *self {
IoStandardStream::Stdout(ref s) => IoStandardStreamLock::StdoutLock(s.lock()), IoStandardStream::Stdout(ref s) => {
IoStandardStream::Stderr(ref s) => IoStandardStreamLock::StderrLock(s.lock()), IoStandardStreamLock::StdoutLock(s.lock())
}
IoStandardStream::Stderr(ref s) => {
IoStandardStreamLock::StderrLock(s.lock())
}
} }
} }
} }
@@ -265,7 +273,8 @@ pub struct StandardStream {
/// This implements the `io::Write` and `WriteColor` traits, and is constructed /// This implements the `io::Write` and `WriteColor` traits, and is constructed
/// via the `Write::lock` method. /// via the `Write::lock` method.
/// ///
/// The lifetime `'a` refers to the lifetime of the corresponding `StandardStream`. /// The lifetime `'a` refers to the lifetime of the corresponding
/// `StandardStream`.
pub struct StandardStreamLock<'a> { pub struct StandardStreamLock<'a> {
wtr: LossyStandardStream<WriterInner<'a, IoStandardStreamLock<'a>>>, wtr: LossyStandardStream<WriterInner<'a, IoStandardStreamLock<'a>>>,
} }
@@ -332,7 +341,9 @@ impl StandardStream {
} else { } else {
WriterInner::NoColor(NoColor(IoStandardStream::new(sty))) WriterInner::NoColor(NoColor(IoStandardStream::new(sty)))
}; };
StandardStream { wtr: LossyStandardStream::new(wtr).is_console(is_win_console) } StandardStream {
wtr: LossyStandardStream::new(wtr).is_console(is_win_console),
}
} }
/// Create a new `StandardStream` with the given color preferences that /// Create a new `StandardStream` with the given color preferences that
@@ -405,7 +416,8 @@ impl<'a> StandardStreamLock<'a> {
} }
#[cfg(windows)] #[cfg(windows)]
WriterInner::WindowsLocked{..} => { WriterInner::WindowsLocked{..} => {
panic!("cannot call StandardStream.lock while a StandardStreamLock is alive"); panic!("cannot call StandardStream.lock while a \
StandardStreamLock is alive");
} }
}; };
StandardStreamLock { wtr: stream.wtr.wrap(locked) } StandardStreamLock { wtr: stream.wtr.wrap(locked) }
@@ -565,7 +577,8 @@ impl BufferWriter {
StandardStreamType::Stdout => wincolor::Console::stdout(), StandardStreamType::Stdout => wincolor::Console::stdout(),
StandardStreamType::Stderr => wincolor::Console::stderr(), StandardStreamType::Stderr => wincolor::Console::stderr(),
}.ok().map(Mutex::new); }.ok().map(Mutex::new);
let stream = LossyStandardStream::new(IoStandardStream::new(sty)).is_console(con.is_some()); let stream = LossyStandardStream::new(IoStandardStream::new(sty))
.is_console(con.is_some());
BufferWriter { BufferWriter {
stream: stream, stream: stream,
printed: AtomicBool::new(false), printed: AtomicBool::new(false),
@@ -1253,7 +1266,9 @@ struct LossyStandardStream<W> {
impl<W: io::Write> LossyStandardStream<W> { impl<W: io::Write> LossyStandardStream<W> {
#[cfg(not(windows))] #[cfg(not(windows))]
fn new(wtr: W) -> LossyStandardStream<W> { LossyStandardStream { wtr: wtr } } fn new(wtr: W) -> LossyStandardStream<W> {
LossyStandardStream { wtr: wtr }
}
#[cfg(windows)] #[cfg(windows)]
fn new(wtr: W) -> LossyStandardStream<W> { fn new(wtr: W) -> LossyStandardStream<W> {