matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge pull request #1412 from matthiasbeyer/libimagrt/stdin-is-available

Browse source 
Make stdin always available
This commit is contained in:
Matthias Beyer 2018-04-18 18:52:55 +02:00 committed by GitHub
commit 7634bd77c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,8 +52,6 @@ pub struct Runtime<'a> {
configuration: Option<Value>,
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 {
@ -457,11 +449,7 @@ impl<'a> Runtime<'a> {
}
pub fn stdin(&self) -> Option<Stdin> {
if self.stdin_is_tty {
Some(::std::io::stdin())
} else {
None
}
Some(::std::io::stdin())
}
/// Helper for handling subcommands which are not available.