summaryrefslogtreecommitdiffstats
path: root/tokio/src/signal/unix/driver.rs
diff options
context:
space:
mode:
Diffstat (limited to 'tokio/src/signal/unix/driver.rs')
-rw-r--r--tokio/src/signal/unix/driver.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/tokio/src/signal/unix/driver.rs b/tokio/src/signal/unix/driver.rs
index 8e5ed7d0..323bb9df 100644
--- a/tokio/src/signal/unix/driver.rs
+++ b/tokio/src/signal/unix/driver.rs
@@ -3,7 +3,7 @@
//! Signal driver
use crate::io::driver::Driver as IoDriver;
-use crate::io::PollEvented;
+use crate::io::{Interest, PollEvented};
use crate::park::Park;
use crate::signal::registry::globals;
@@ -76,7 +76,7 @@ impl Driver {
let receiver = UnixStream::from_std(original.try_clone()?);
let receiver = PollEvented::new_with_interest_and_handle(
receiver,
- mio::Interest::READABLE | mio::Interest::WRITABLE,
+ Interest::READABLE | Interest::WRITABLE,
park.handle(),
)?;
@@ -103,7 +103,7 @@ impl Driver {
let waker = unsafe { Waker::from_raw(RawWaker::new(ptr::null(), &NOOP_WAKER_VTABLE)) };
let mut cx = Context::from_waker(&waker);
- let ev = match self.receiver.poll_read_ready(&mut cx) {
+ let ev = match self.receiver.registration().poll_read_ready(&mut cx) {
Poll::Ready(Ok(ev)) => ev,
Poll::Ready(Err(e)) => panic!("reactor gone: {}", e),
Poll::Pending => return, // No wake has arrived, bail
@@ -113,7 +113,7 @@ impl Driver {
// if another signal has come in.
let mut buf = [0; 128];
loop {
- match self.receiver.get_ref().read(&mut buf) {
+ match (&*self.receiver).read(&mut buf) {
Ok(0) => panic!("EOF on self-pipe"),
Ok(_) => continue, // Keep reading
Err(e) if e.kind() == io::ErrorKind::WouldBlock => break,
@@ -121,7 +121,7 @@ impl Driver {
}
}
- self.receiver.clear_readiness(ev);
+ self.receiver.registration().clear_readiness(ev);
// Broadcast any signals which were received
globals().broadcast();