matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Let the OutputProxy hold Stdout/Stderr objects, so we do not have to aquire them each write!()

Browse source
This commit is contained in:
Matthias Beyer 2018-03-04 15:41:32 +01:00
parent 763f3fab86
commit 0b593d6635
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/core/libimagrt/src/io.rs
View file

@ -31,24 +31,24 @@ use std::io::Write;
/// a "sink" which does not write to either. /// a "sink" which does not write to either.
/// ///
pub enum OutputProxy { pub enum OutputProxy {
Out, Out(::std::io::Stdout),
Err, Err(::std::io::Stderr),
Sink, Sink,
} }
impl Write for OutputProxy { impl Write for OutputProxy {
fn write(&mut self, buf: &[u8]) -> ::std::io::Result<usize> { fn write(&mut self, buf: &[u8]) -> ::std::io::Result<usize> {
match *self { match *self {
OutputProxy::Out => ::std::io::stdout().write(buf), OutputProxy::Out(ref mut r) => r.write(buf),
OutputProxy::Err => ::std::io::stderr().write(buf), OutputProxy::Err(ref mut r) => r.write(buf),
OutputProxy::Sink => Ok(0), OutputProxy::Sink => Ok(0),
} }
} }
fn flush(&mut self) -> ::std::io::Result<()> { fn flush(&mut self) -> ::std::io::Result<()> {
match *self { match *self {
OutputProxy::Out => ::std::io::stdout().flush(), OutputProxy::Out(ref mut r) => r.flush(),
OutputProxy::Err => ::std::io::stderr().flush(), OutputProxy::Err(ref mut r) => r.flush(),
OutputProxy::Sink => Ok(()), OutputProxy::Sink => Ok(()),
} }
} }
@ -58,9 +58,9 @@ impl Write for OutputProxy {
impl Debug for OutputProxy { impl Debug for OutputProxy {
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> Result<(), ::std::fmt::Error> { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> Result<(), ::std::fmt::Error> {
match *self { match *self {
OutputProxy::Out => write!(f, "OutputProxy(Stdout)"), OutputProxy::Out(..) => write!(f, "OutputProxy(Stdout)"),
OutputProxy::Err => write!(f, "OutputProxy(Stderr)"), OutputProxy::Err(..) => write!(f, "OutputProxy(Stderr)"),
OutputProxy::Sink => write!(f, "OutputProxy(Sink)"), OutputProxy::Sink => write!(f, "OutputProxy(Sink)"),
} }
} }
} }

6
lib/core/libimagrt/src/runtime.rs
View file

@ -447,14 +447,14 @@ impl<'a> Runtime<'a> {
pub fn stdout(&self) -> OutputProxy { pub fn stdout(&self) -> OutputProxy {
if self.stdout_is_tty { if self.stdout_is_tty {
OutputProxy::Out OutputProxy::Out(::std::io::stdout())
} else { } else {
OutputProxy::Err OutputProxy::Err(::std::io::stderr())
} }
} }
pub fn stderr(&self) -> OutputProxy { pub fn stderr(&self) -> OutputProxy {
OutputProxy::Err OutputProxy::Err(::std::io::stderr())
} }
pub fn stdin(&self) -> Option<Stdin> { pub fn stdin(&self) -> Option<Stdin> {