refactor(lib): replace 'try' macro with '?'

almielczarek · Jan 18, 2019 · c69d109 · c69d109
1 parent 6bce753
commit c69d109
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/client/connect/http.rs b/src/client/connect/http.rs
@@ -333,7 +333,7 @@ impl<R: Resolve> Future for HttpConnecting<R> {
                     }
                 },
                 State::Resolving(ref mut future, local_addr) => {
-                    match try!(future.poll()) {
+                    match future.poll()? {
                         Async::NotReady => return Ok(Async::NotReady),
                         Async::Ready(addrs) => {
                             let port = self.port;

diff --git a/src/mock.rs b/src/mock.rs
@@ -213,7 +213,7 @@ impl<T: Read> Read for AsyncIo<T> {
             Err(self.would_block())
         } else {
             let n = cmp::min(self.bytes_until_block, buf.len());
-            let n = try!(self.inner.read(&mut buf[..n]));
+            let n = self.inner.read(&mut buf[..n])?;
             self.bytes_until_block -= n;
             Ok(n)
         }
@@ -234,7 +234,7 @@ impl<T: Write> Write for AsyncIo<T> {
             trace!("AsyncIo::write; {} bytes", data.len());
             self.flushed = false;
             let n = cmp::min(self.bytes_until_block, data.len());
-            let n = try!(self.inner.write(&data[..n]));
+            let n = self.inner.write(&data[..n])?;
             self.bytes_until_block -= n;
             Ok(n)
         }

diff --git a/src/proto/h1/io.rs b/src/proto/h1/io.rs
@@ -141,7 +141,10 @@ where
         S: Http1Transaction,
     {
         loop {
-            match try!(S::parse(&mut self.read_buf, ParseContext { cached_headers: ctx.cached_headers, req_method: ctx.req_method, })) {
+            match S::parse(&mut self.read_buf, ParseContext {
+                cached_headers: ctx.cached_headers,
+                req_method: ctx.req_method,
+            })? {
                 Some(msg) => {
                     debug!("parsed {} headers", msg.head.headers.len());
                     return Ok(Async::Ready(msg))