aboutsummaryrefslogtreecommitdiffstats
path: root/src/builtins.rs
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2019-10-28 13:28:06 -0400
committerJesse Luehrs <doy@tozt.net>2019-10-28 13:28:06 -0400
commit1a2bc078ef06b3a28d5c8ca5f2f495d63c3afbd8 (patch)
treeedaaa8ac2f545f3694b386f2baefc8312f0dfb52 /src/builtins.rs
parent607e9a1f1cbaa3f08d2d4c109821c6e987fa5a7e (diff)
downloadnbsh-old-1a2bc078ef06b3a28d5c8ca5f2f495d63c3afbd8.tar.gz
nbsh-old-1a2bc078ef06b3a28d5c8ca5f2f495d63c3afbd8.zip
move to tokio-pty-process-stream
Diffstat (limited to 'src/builtins.rs')
-rw-r--r--src/builtins.rs22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/builtins.rs b/src/builtins.rs
index d1f5b61..eb7989d 100644
--- a/src/builtins.rs
+++ b/src/builtins.rs
@@ -60,17 +60,17 @@ impl Builtin {
#[must_use = "streams do nothing unless polled"]
impl futures::stream::Stream for Builtin {
- type Item = crate::eval::CommandEvent;
+ type Item = tokio_pty_process_stream::Event;
type Error = Error;
fn poll(&mut self) -> futures::Poll<Option<Self::Item>, Self::Error> {
if !self.started {
self.started = true;
Ok(futures::Async::Ready(Some(
- crate::eval::CommandEvent::CommandStart(
- self.cmd.clone(),
- self.args.clone(),
- ),
+ tokio_pty_process_stream::Event::CommandStart {
+ cmd: self.cmd.clone(),
+ args: self.args.clone(),
+ },
)))
} else if !self.done {
self.done = true;
@@ -82,17 +82,17 @@ impl futures::stream::Stream for Builtin {
};
res.map(|_| {
futures::Async::Ready(Some(
- crate::eval::CommandEvent::CommandExit(
- std::process::ExitStatus::from_raw(0),
- ),
+ tokio_pty_process_stream::Event::CommandExit {
+ status: std::process::ExitStatus::from_raw(0),
+ },
))
})
.or_else(|e| match e {
Error::UnknownBuiltin { .. } => Err(e),
_ => Ok(futures::Async::Ready(Some(
- crate::eval::CommandEvent::CommandExit(
- std::process::ExitStatus::from_raw(256),
- ),
+ tokio_pty_process_stream::Event::CommandExit {
+ status: std::process::ExitStatus::from_raw(256),
+ },
))),
})
} else {