summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian Tescher <jatescher@gmail.com>2017-01-24 20:52:48 -0800
committerJulian Tescher <jatescher@gmail.com>2017-01-24 20:52:48 -0800
commitbaeb35b6d42765f283170002da477a3d72c75b36 (patch)
tree8d10ca044b9e4d9ffe6bc996651412ba536ce908
parente8d4524586e4a3352bfd657641b144c8fa5dfea2 (diff)
Fix typos
-rw-r--r--examples/sink.rs2
-rw-r--r--src/io/mod.rs4
-rw-r--r--src/reactor/interval.rs2
-rw-r--r--src/reactor/poll_evented.rs2
4 files changed, 5 insertions, 5 deletions
diff --git a/examples/sink.rs b/examples/sink.rs
index b344b6d2..2893adc6 100644
--- a/examples/sink.rs
+++ b/examples/sink.rs
@@ -36,7 +36,7 @@ fn main() {
let mut l = Core::new().unwrap();
let socket = TcpListener::bind(&addr, &l.handle()).unwrap();
- println!("Listenering on: {}", addr);
+ println!("Listening on: {}", addr);
let server = socket.incoming().and_then(|(socket, addr)| {
println!("got a socket: {}", addr);
write(socket).or_else(|_| Ok(()))
diff --git a/src/io/mod.rs b/src/io/mod.rs
index 72d89e10..f8d283e6 100644
--- a/src/io/mod.rs
+++ b/src/io/mod.rs
@@ -64,7 +64,7 @@ pub use self::write_all::{write_all, WriteAll};
/// Additionally, they're associated with the ability to test whether they're
/// readable or writable.
///
-/// Importantly, the methods of this trait are intended to be used in conjuction
+/// Importantly, the methods of this trait are intended to be used in conjunction
/// with the current task of a future. Namely whenever any of them return a
/// value that indicates "would block" the current future's task is arranged to
/// receive a notification when the method would otherwise not indicate that it
@@ -153,7 +153,7 @@ pub trait Io: io::Read + io::Write {
/// Most implementations of `FramedIo` are for doing protocol level
/// serialization and deserialization.
///
-/// Importantly, the methods of this trait are intended to be used in conjuction
+/// Importantly, the methods of this trait are intended to be used in conjunction
/// with the current task of a future. Namely whenever any of them return a
/// value that indicates "would block" the current future's task is arranged to
/// receive a notification when the method would otherwise not indicate that it
diff --git a/src/reactor/interval.rs b/src/reactor/interval.rs
index a66258fc..0bf3143d 100644
--- a/src/reactor/interval.rs
+++ b/src/reactor/interval.rs
@@ -158,7 +158,7 @@ mod test {
/// TODO: this test actually should be successful, but since we can't
/// multiply Duration on anything larger than u32 easily we decided
- /// to allow thit to fail for now
+ /// to allow it to fail for now
#[test]
#[should_panic(expected = "can't skip more than 4 billion intervals")]
fn large_skip() {
diff --git a/src/reactor/poll_evented.rs b/src/reactor/poll_evented.rs
index 33095a95..35127646 100644
--- a/src/reactor/poll_evented.rs
+++ b/src/reactor/poll_evented.rs
@@ -154,7 +154,7 @@ impl<E> PollEvented<E> {
/// then again writable.
///
/// Note that it is also only valid to call this method if `poll_write`
- /// previously indicated that the object is writeable. That is, this function
+ /// previously indicated that the object is writable. That is, this function
/// must always be paired with calls to `poll_write` previously.
pub fn need_write(&self) {
self.readiness.fetch_and(!2, Ordering::SeqCst);