summaryrefslogtreecommitdiffstats
path: root/tokio-reactor
diff options
context:
space:
mode:
authorStjepan Glavina <stjepang@gmail.com>2018-07-31 05:46:04 +0200
committerCarl Lerche <me@carllerche.com>2018-07-30 20:46:04 -0700
commit629c9f0698ced9d520a415a4360500ac742e86f9 (patch)
tree8117e2a273ef690be58a345df7df2dd9bfe0f6bf /tokio-reactor
parent5d0d2a2e1214f856993df6965825c89bfcaa879e (diff)
Small fixes (#508)
* Make Shutdown public * Remove unused import * Fix documentation mistake * Fix typo
Diffstat (limited to 'tokio-reactor')
-rw-r--r--tokio-reactor/src/lib.rs5
-rw-r--r--tokio-reactor/src/poll_evented.rs6
2 files changed, 5 insertions, 6 deletions
diff --git a/tokio-reactor/src/lib.rs b/tokio-reactor/src/lib.rs
index 0c7a83f2..713deff5 100644
--- a/tokio-reactor/src/lib.rs
+++ b/tokio-reactor/src/lib.rs
@@ -49,7 +49,7 @@ mod registration;
// ===== Public re-exports =====
-pub use self::background::Background;
+pub use self::background::{Background, Shutdown};
pub use self::registration::Registration;
pub use self::poll_evented::PollEvented;
@@ -61,7 +61,7 @@ use tokio_executor::Enter;
use tokio_executor::park::{Park, Unpark};
use std::{fmt, usize};
-use std::io::{self, ErrorKind};
+use std::io;
use std::mem;
use std::cell::RefCell;
use std::sync::atomic::Ordering::{Relaxed, SeqCst};
@@ -353,7 +353,6 @@ impl Reactor {
// happened.
match self.inner.io.poll(&mut self.events, max_wait) {
Ok(_) => {}
- Err(ref e) if e.kind() == ErrorKind::Interrupted => return Ok(()),
Err(e) => return Err(e),
}
diff --git a/tokio-reactor/src/poll_evented.rs b/tokio-reactor/src/poll_evented.rs
index 350d4c92..99dd8aa4 100644
--- a/tokio-reactor/src/poll_evented.rs
+++ b/tokio-reactor/src/poll_evented.rs
@@ -52,7 +52,7 @@ use std::sync::atomic::Ordering::Relaxed;
///
/// This allows the caller to implement additional functions. For example,
/// [`TcpListener`] implements poll_accept by using [`poll_read_ready`] and
-/// [`clear_write_ready`].
+/// [`clear_read_ready`].
///
/// ```rust,ignore
/// pub fn poll_accept(&mut self) -> Poll<(net::TcpStream, SocketAddr), io::Error> {
@@ -85,7 +85,7 @@ use std::sync::atomic::Ordering::Relaxed;
/// [`Registration`]: struct.Registration.html
/// [`TcpListener`]: ../net/struct.TcpListener.html
/// [`clear_read_ready`]: #method.clear_read_ready
-/// [`clear_write_ready`]: #method.clear_write_ready
+/// [`clear_read_ready`]: #method.clear_read_ready
/// [`poll_read_ready`]: #method.poll_read_ready
/// [`poll_write_ready`]: #method.poll_write_ready
pub struct PollEvented<E: Evented> {
@@ -342,7 +342,7 @@ where E: Evented
/// cannot be cleared as it is a final state.
///
/// After calling this function, `poll_write_ready(Ready::writable())` will
- /// return `NotReady` until a new read readiness event has been received.
+ /// return `NotReady` until a new write readiness event has been received.
///
/// # Panics
///