Merge pull request #1412 from matthiasbeyer/libimagrt/stdin-is-available
Make stdin always available
This commit is contained in:
commit
7634bd77c5
1 changed files with 2 additions and 14 deletions
|
@ -52,8 +52,6 @@ pub struct Runtime<'a> {
|
||||||
configuration: Option<Value>,
|
configuration: Option<Value>,
|
||||||
cli_matches: ArgMatches<'a>,
|
cli_matches: ArgMatches<'a>,
|
||||||
store: Store,
|
store: Store,
|
||||||
stdin_is_tty: bool,
|
|
||||||
stdout_is_tty: bool,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> Runtime<'a> {
|
impl<'a> Runtime<'a> {
|
||||||
|
@ -144,8 +142,6 @@ impl<'a> Runtime<'a> {
|
||||||
configuration: config,
|
configuration: config,
|
||||||
rtp: rtp,
|
rtp: rtp,
|
||||||
store: store,
|
store: store,
|
||||||
stdout_is_tty: ::atty::is(::atty::Stream::Stdout),
|
|
||||||
stdin_is_tty: ::atty::is(::atty::Stream::Stdin),
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.chain_err(|| RuntimeErrorKind::Instantiate)
|
.chain_err(|| RuntimeErrorKind::Instantiate)
|
||||||
|
@ -445,11 +441,7 @@ impl<'a> Runtime<'a> {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn stdout(&self) -> OutputProxy {
|
pub fn stdout(&self) -> OutputProxy {
|
||||||
if self.stdout_is_tty {
|
|
||||||
OutputProxy::Out(::std::io::stdout())
|
OutputProxy::Out(::std::io::stdout())
|
||||||
} else {
|
|
||||||
OutputProxy::Err(::std::io::stderr())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn stderr(&self) -> OutputProxy {
|
pub fn stderr(&self) -> OutputProxy {
|
||||||
|
@ -457,11 +449,7 @@ impl<'a> Runtime<'a> {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn stdin(&self) -> Option<Stdin> {
|
pub fn stdin(&self) -> Option<Stdin> {
|
||||||
if self.stdin_is_tty {
|
|
||||||
Some(::std::io::stdin())
|
Some(::std::io::stdin())
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Helper for handling subcommands which are not available.
|
/// Helper for handling subcommands which are not available.
|
||||||
|
|
Loading…
Reference in a new issue