Merge branch 'Xudong-Huang:master' into master

Author: casibbald

Cargo.toml

@@ -38,7 +38,7 @@ fastrand = { version = "2.0", optional = true }
 may_queue = { version = "0.1", path = "may_queue" }
 
 [target.'cfg(unix)'.dependencies]
-nix = { version = "0.30", features = ["event", "socket"] }
+nix = { version = "0.31", features = ["event", "socket"] }
 libc = "0.2"
 
 [target.'cfg(windows)'.dependencies.windows-sys]
@@ -62,7 +62,7 @@ docopt = "1.0"
 httparse = "1.1"
 tempfile = "3"
 native-tls = "0.2"
-tungstenite = "0.28"
+tungstenite = "0.29"
 serde_derive = "1.0"
 
 [features]

src/timeout_list.rs

@@ -189,18 +189,14 @@ impl<T> TimeOutList<T> {
             // first peek the BH to see if there is any timeout event
             let mut entry = {
                 let mut timer_bh = self.timer_bh.lock();
-                let top_entry = timer_bh.peek();
-                match top_entry {
-                    // the latest timeout event not happened yet
-                    Some(entry) => {
-                        if entry.time > now {
-                            return Some(entry.time - now);
-                        } else {
-                            // find out one entry
-                        }
-                    }
-                    None => return None,
+                let top_entry = timer_bh.peek()?;
+
+                // the latest timeout event not happened yet
+                if top_entry.time > now {
+                    return Some(top_entry.time - now);
                 }
+
+                // find out one entry
                 let entry = timer_bh.pop().unwrap();
                 entry.list.in_use.store(0, Ordering::Release);
                 entry