From f12b761b779f3008d0651651489052500074245d Mon Sep 17 00:00:00 2001 From: arthurprs Date: Sun, 3 Sep 2017 18:39:04 +0200 Subject: [PATCH] Prefer ErrorKind::WouldBlock --- src/io/split.rs | 6 +++--- src/lib.rs | 6 ------ src/net/tcp.rs | 6 +++--- src/net/udp/mod.rs | 4 ++-- src/reactor/poll_evented.rs | 12 ++++++------ 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/io/split.rs b/src/io/split.rs index 22f3d63b4..ac20294f3 100644 --- a/src/io/split.rs +++ b/src/io/split.rs @@ -46,7 +46,7 @@ impl Read for ReadHalf { fn read(&mut self, buf: &mut [u8]) -> io::Result { match self.handle.poll_lock() { Async::Ready(mut l) => l.read(buf), - Async::NotReady => Err(::would_block()), + Async::NotReady => Err(io::ErrorKind::WouldBlock.into()), } } } @@ -55,14 +55,14 @@ impl Write for WriteHalf { fn write(&mut self, buf: &[u8]) -> io::Result { match self.handle.poll_lock() { Async::Ready(mut l) => l.write(buf), - Async::NotReady => Err(::would_block()), + Async::NotReady => Err(io::ErrorKind::WouldBlock.into()), } } fn flush(&mut self) -> io::Result<()> { match self.handle.poll_lock() { Async::Ready(mut l) => l.flush(), - Async::NotReady => Err(::would_block()), + Async::NotReady => Err(io::ErrorKind::WouldBlock.into()), } } } diff --git a/src/lib.rs b/src/lib.rs index 086e6bb6f..2a68df887 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -115,9 +115,3 @@ mod heap; pub mod channel; pub mod net; pub mod reactor; - -use std::io as sio; - -fn would_block() -> sio::Error { - sio::Error::new(sio::ErrorKind::WouldBlock, "would block") -} diff --git a/src/net/tcp.rs b/src/net/tcp.rs index 3e5214378..e9022fc65 100644 --- a/src/net/tcp.rs +++ b/src/net/tcp.rs @@ -63,7 +63,7 @@ impl TcpListener { match pending.poll().expect("shouldn't be canceled") { Async::NotReady => { self.pending_accept = Some(pending); - return Err(::would_block()) + return Err(io::ErrorKind::WouldBlock.into()) }, Async::Ready(r) => return r, } @@ -541,7 +541,7 @@ impl ::io::Io for TcpStream { fn read_vec(&mut self, bufs: &mut [&mut IoVec]) -> io::Result { if let Async::NotReady = ::poll_read(self) { - return Err(::would_block()) + return Err(io::ErrorKind::WouldBlock.into()) } let r = self.io.get_ref().read_bufs(bufs); if is_wouldblock(&r) { @@ -552,7 +552,7 @@ impl ::io::Io for TcpStream { fn write_vec(&mut self, bufs: &[&IoVec]) -> io::Result { if let Async::NotReady = ::poll_write(self) { - return Err(::would_block()) + return Err(io::ErrorKind::WouldBlock.into()) } let r = self.io.get_ref().write_bufs(bufs); if is_wouldblock(&r) { diff --git a/src/net/udp/mod.rs b/src/net/udp/mod.rs index 430cbe3a7..c49e91b74 100644 --- a/src/net/udp/mod.rs +++ b/src/net/udp/mod.rs @@ -101,7 +101,7 @@ impl UdpSocket { /// documentation for concrete examples. pub fn send_to(&self, buf: &[u8], target: &SocketAddr) -> io::Result { if let Async::NotReady = self.io.poll_write() { - return Err(::would_block()) + return Err(io::ErrorKind::WouldBlock.into()) } match self.io.get_ref().send_to(buf, target) { Ok(n) => Ok(n), @@ -145,7 +145,7 @@ impl UdpSocket { /// read and the address from whence the data came. pub fn recv_from(&self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> { if let Async::NotReady = self.io.poll_read() { - return Err(::would_block()) + return Err(io::ErrorKind::WouldBlock.into()) } match self.io.get_ref().recv_from(buf) { Ok(n) => Ok(n), diff --git a/src/reactor/poll_evented.rs b/src/reactor/poll_evented.rs index 401a922db..06e737986 100644 --- a/src/reactor/poll_evented.rs +++ b/src/reactor/poll_evented.rs @@ -274,7 +274,7 @@ impl PollEvented { impl Read for PollEvented { fn read(&mut self, buf: &mut [u8]) -> io::Result { if let Async::NotReady = self.poll_read() { - return Err(::would_block()) + return Err(io::ErrorKind::WouldBlock.into()) } let r = self.get_mut().read(buf); if is_wouldblock(&r) { @@ -287,7 +287,7 @@ impl Read for PollEvented { impl Write for PollEvented { fn write(&mut self, buf: &[u8]) -> io::Result { if let Async::NotReady = self.poll_write() { - return Err(::would_block()) + return Err(io::ErrorKind::WouldBlock.into()) } let r = self.get_mut().write(buf); if is_wouldblock(&r) { @@ -298,7 +298,7 @@ impl Write for PollEvented { fn flush(&mut self) -> io::Result<()> { if let Async::NotReady = self.poll_write() { - return Err(::would_block()) + return Err(io::ErrorKind::WouldBlock.into()) } let r = self.get_mut().flush(); if is_wouldblock(&r) { @@ -333,7 +333,7 @@ impl<'a, E> Read for &'a PollEvented { fn read(&mut self, buf: &mut [u8]) -> io::Result { if let Async::NotReady = self.poll_read() { - return Err(::would_block()) + return Err(io::ErrorKind::WouldBlock.into()) } let r = self.get_ref().read(buf); if is_wouldblock(&r) { @@ -348,7 +348,7 @@ impl<'a, E> Write for &'a PollEvented { fn write(&mut self, buf: &[u8]) -> io::Result { if let Async::NotReady = self.poll_write() { - return Err(::would_block()) + return Err(io::ErrorKind::WouldBlock.into()) } let r = self.get_ref().write(buf); if is_wouldblock(&r) { @@ -359,7 +359,7 @@ impl<'a, E> Write for &'a PollEvented fn flush(&mut self) -> io::Result<()> { if let Async::NotReady = self.poll_write() { - return Err(::would_block()) + return Err(io::ErrorKind::WouldBlock.into()) } let r = self.get_ref().flush(); if is_wouldblock(&r) {