Use ? operator more (#33)

Author: taiki-e

runtime-tokio/src/tcp.rs

@@ -20,19 +20,17 @@ pub(crate) struct TcpListener {
 
 impl runtime_raw::TcpStream for TcpStream {
     fn poll_write_ready(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
-        match self.tokio_stream.poll_write_ready() {
-            Err(e) => Poll::Ready(Err(e)),
-            Ok(futures01::Async::Ready(_)) => Poll::Ready(Ok(())),
-            Ok(futures01::Async::NotReady) => Poll::Pending,
+        match self.tokio_stream.poll_write_ready()? {
+            futures01::Async::Ready(_) => Poll::Ready(Ok(())),
+            futures01::Async::NotReady => Poll::Pending,
         }
     }
 
     fn poll_read_ready(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
         let mask = mio::Ready::readable();
-        match self.tokio_stream.poll_read_ready(mask) {
-            Err(e) => Poll::Ready(Err(e)),
-            Ok(futures01::Async::Ready(_)) => Poll::Ready(Ok(())),
-            Ok(futures01::Async::NotReady) => Poll::Pending,
+        match self.tokio_stream.poll_read_ready(mask)? {
+            futures01::Async::Ready(_) => Poll::Ready(Ok(())),
+            futures01::Async::NotReady => Poll::Pending,
         }
     }
 
@@ -101,13 +99,12 @@ impl runtime_raw::TcpListener for TcpListener {
         _cx: &mut Context<'_>,
     ) -> Poll<io::Result<Pin<Box<dyn runtime_raw::TcpStream>>>> {
         let listener = unsafe { &mut self.get_unchecked_mut().tokio_listener };
-        match listener.poll_accept() {
-            Err(e) => Poll::Ready(Err(e)),
-            Ok(futures01::Async::Ready((tokio_stream, _))) => {
+        match listener.poll_accept()? {
+            futures01::Async::Ready((tokio_stream, _)) => {
                 let stream = Box::pin(TcpStream { tokio_stream });
                 Poll::Ready(Ok(stream))
             }
-            Ok(futures01::Async::NotReady) => Poll::Pending,
+            futures01::Async::NotReady => Poll::Pending,
         }
     }
 

runtime-tokio/src/udp.rs

@@ -22,10 +22,9 @@ impl runtime_raw::UdpSocket for UdpSocket {
         receiver: &SocketAddr,
     ) -> Poll<io::Result<usize>> {
         let socket = unsafe { &mut self.get_unchecked_mut().tokio_socket };
-        match socket.poll_send_to(&buf, &receiver) {
-            Err(e) => Poll::Ready(Err(e)),
-            Ok(futures01::Async::Ready(size)) => Poll::Ready(Ok(size)),
-            Ok(futures01::Async::NotReady) => Poll::Pending,
+        match socket.poll_send_to(&buf, &receiver)? {
+            futures01::Async::Ready(size) => Poll::Ready(Ok(size)),
+            futures01::Async::NotReady => Poll::Pending,
         }
     }
 
@@ -35,10 +34,9 @@ impl runtime_raw::UdpSocket for UdpSocket {
         buf: &mut [u8],
     ) -> Poll<io::Result<(usize, SocketAddr)>> {
         let socket = unsafe { &mut self.get_unchecked_mut().tokio_socket };
-        match socket.poll_recv_from(buf) {
-            Err(e) => Poll::Ready(Err(e)),
-            Ok(futures01::Async::Ready((size, addr))) => Poll::Ready(Ok((size, addr))),
-            Ok(futures01::Async::NotReady) => Poll::Pending,
+        match socket.poll_recv_from(buf)? {
+            futures01::Async::Ready((size, addr)) => Poll::Ready(Ok((size, addr))),
+            futures01::Async::NotReady => Poll::Pending,
         }
     }
 

src/net/tcp.rs

@@ -463,13 +463,9 @@ impl<'stream> Future for Accept<'stream> {
     type Output = io::Result<(TcpStream, SocketAddr)>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        match ready!(self.inner.poll_next_unpin(cx)).unwrap() {
-            Err(err) => Poll::Ready(Err(err)),
-            Ok(stream) => {
-                let addr = stream.peer_addr().unwrap();
-                Poll::Ready(Ok((stream, addr)))
-            }
-        }
+        let stream = ready!(self.inner.poll_next_unpin(cx)).unwrap()?;
+        let addr = stream.peer_addr().unwrap();
+        Poll::Ready(Ok((stream, addr)))
     }
 }