From 38726c5906a2add6511e211634d9966097a8a798 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 18 Apr 2018 17:56:09 +0200 Subject: [PATCH] Always use stdout via output proxy The switching between stdout and stderr on an automated basis caused errors in the using code, where output was redirected but shouldn't. --- lib/core/libimagrt/src/runtime.rs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/core/libimagrt/src/runtime.rs b/lib/core/libimagrt/src/runtime.rs index 1c24e5af..c35af77c 100644 --- a/lib/core/libimagrt/src/runtime.rs +++ b/lib/core/libimagrt/src/runtime.rs @@ -52,8 +52,6 @@ pub struct Runtime<'a> { configuration: Option, cli_matches: ArgMatches<'a>, store: Store, - stdin_is_tty: bool, - stdout_is_tty: bool, } impl<'a> Runtime<'a> { @@ -144,8 +142,6 @@ impl<'a> Runtime<'a> { configuration: config, rtp: rtp, store: store, - stdout_is_tty: ::atty::is(::atty::Stream::Stdout), - stdin_is_tty: ::atty::is(::atty::Stream::Stdin), } }) .chain_err(|| RuntimeErrorKind::Instantiate) @@ -445,11 +441,7 @@ impl<'a> Runtime<'a> { } pub fn stdout(&self) -> OutputProxy { - if self.stdout_is_tty { - OutputProxy::Out(::std::io::stdout()) - } else { - OutputProxy::Err(::std::io::stderr()) - } + OutputProxy::Out(::std::io::stdout()) } pub fn stderr(&self) -> OutputProxy {