diff --git a/src/unix/mod.rs b/src/unix/mod.rs index 2ac0a128b..4743bf587 100644 --- a/src/unix/mod.rs +++ b/src/unix/mod.rs @@ -32,7 +32,7 @@ use mio::unix::{EventedFd, UnixReady}; use mio::{PollOpt, Ready, Token}; use mio::event::Evented; use mio; -use self::reap::{EventedReaper, Kill, Wait}; +use self::reap::{Kill, Reaper, Wait}; use self::tokio_signal::unix::Signal; use std::fmt; use std::io; @@ -55,7 +55,7 @@ impl Kill for process::Child { #[must_use = "futures do nothing unless polled"] pub struct Child { - inner: EventedReaper>>, + inner: Reaper>>, } impl fmt::Debug for Child { @@ -76,7 +76,7 @@ impl Child { let signal = Signal::with_handle(libc::SIGCHLD, handle).flatten_stream(); let child = Child { - inner: EventedReaper::new(inner, signal), + inner: Reaper::new(inner, signal), }; Ok((child, stdin, stdout, stderr)) diff --git a/src/unix/reap.rs b/src/unix/reap.rs index 2e6d36e66..2326c650b 100644 --- a/src/unix/reap.rs +++ b/src/unix/reap.rs @@ -18,12 +18,12 @@ pub trait Kill { /// Orchestrates between registering interest for receiving signals when a /// child process has exited, and attempting to poll for process completion. #[derive(Debug)] -pub struct EventedReaper { +pub struct Reaper { inner: W, signal: S, } -impl Deref for EventedReaper { +impl Deref for Reaper { type Target = W; fn deref(&self) -> &Self::Target { @@ -31,7 +31,7 @@ impl Deref for EventedReaper { } } -impl EventedReaper { +impl Reaper { pub fn new(inner: W, signal: S) -> Self { Self { inner, @@ -40,7 +40,7 @@ impl EventedReaper { } } -impl Future for EventedReaper +impl Future for Reaper where W: Wait, S: Stream, { @@ -88,7 +88,7 @@ impl Future for EventedReaper } } -impl Kill for EventedReaper +impl Kill for Reaper where W: Kill, { fn kill(&mut self) -> io::Result<()> { @@ -169,10 +169,10 @@ mod test { } #[test] - fn evented_reaper() { + fn reaper() { let exit = ExitStatus::from_raw(0); let mock = MockWait::new(exit.clone(), 3); - let mut grim = EventedReaper::new(mock, MockStream::new(vec!( + let mut grim = Reaper::new(mock, MockStream::new(vec!( None, Some(()), None, @@ -200,7 +200,7 @@ mod test { #[test] fn kill() { let exit = ExitStatus::from_raw(0); - let mut grim = EventedReaper::new( + let mut grim = Reaper::new( MockWait::new(exit, 0), MockStream::new(vec!(None)) );