From 93e1d4778dd50f04440d7fd6f06e6a60fac0a3dc Mon Sep 17 00:00:00 2001
From: Corey Farwell <coreyf@rwell.org>
Date: Wed, 7 Sep 2016 21:29:37 -0400
Subject: [PATCH 1/3] Use `while..let` construct for loop.

---
 src/event_loop/mod.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/event_loop/mod.rs b/src/event_loop/mod.rs
index 90ac92d12..936d76105 100644
--- a/src/event_loop/mod.rs
+++ b/src/event_loop/mod.rs
@@ -356,11 +356,7 @@ impl Loop {
     }
 
     fn consume_timeouts(&mut self, now: Instant) {
-        loop {
-            let idx = match self.timer_wheel.borrow_mut().poll(now) {
-                Some(idx) => idx,
-                None => break,
-            };
+        while let Some(idx) = self.timer_wheel.borrow_mut().poll(now) {
             trace!("firing timeout: {}", idx);
             let handle = self.timeouts.borrow_mut()[idx].1.fire();
             if let Some(handle) = handle {

From a9d24810bebdedee12f4f928fb8a55003d7ad8ad Mon Sep 17 00:00:00 2001
From: Corey Farwell <coreyf@rwell.org>
Date: Wed, 7 Sep 2016 21:29:52 -0400
Subject: [PATCH 2/3] Avoid unnecessary `Option::expect` indirection.

---
 src/event_loop/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/event_loop/mod.rs b/src/event_loop/mod.rs
index 936d76105..88c58cadf 100644
--- a/src/event_loop/mod.rs
+++ b/src/event_loop/mod.rs
@@ -492,7 +492,7 @@ impl Loop {
 
             Message::AddTimeout(at, slot) => {
                 slot.try_produce(self.add_timeout(at))
-                    .ok().expect("interference with try_produce on timeout");
+                    .expect("interference with try_produce on timeout");
             }
             Message::UpdateTimeout(t, handle) => self.update_timeout(t, handle),
             Message::CancelTimeout(t) => self.cancel_timeout(t),

From 9fe1d8aecaebfae07b503f908a84dced84ddfba8 Mon Sep 17 00:00:00 2001
From: Corey Farwell <coreyf@rwell.org>
Date: Wed, 7 Sep 2016 21:30:11 -0400
Subject: [PATCH 3/3] Remove unnecessary `return` statements.

---
 src/tcp.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tcp.rs b/src/tcp.rs
index f38488958..be94931b3 100644
--- a/src/tcp.rs
+++ b/src/tcp.rs
@@ -393,7 +393,7 @@ impl<'a> Read for &'a TcpStream {
         if is_wouldblock(&r) {
             self.io.need_read();
         }
-        return r
+        r
     }
 }
 
@@ -406,7 +406,7 @@ impl<'a> Write for &'a TcpStream {
         if is_wouldblock(&r) {
             self.io.need_write();
         }
-        return r
+        r
     }
 
     fn flush(&mut self) -> io::Result<()> {
@@ -417,7 +417,7 @@ impl<'a> Write for &'a TcpStream {
         if is_wouldblock(&r) {
             self.io.need_write();
         }
-        return r
+        r
     }
 }