Merge pull request #320 from danieleades/clippy/useless_conversion

remove useless conversions

Author: dwrensha

capnp-rpc/src/twoparty.rs

@@ -69,7 +69,7 @@ impl crate::OutgoingMessage for OutgoingMessage {
         let tmp = *self;
         let OutgoingMessage {message, mut sender} = tmp;
         let m = Rc::new(message);
-        (Promise::from_future(sender.send(m.clone()).map_err(|e| e.into())), m)
+        (Promise::from_future(sender.send(m.clone())), m)
     }
 
     fn take(self: Box<Self>)
@@ -162,7 +162,7 @@ impl <T> crate::Connection<crate::rpc_twoparty_capnp::Side> for Connection<T>
     }
 
     fn shutdown(&mut self, result: ::capnp::Result<()>) -> Promise<(), ::capnp::Error> {
-        Promise::from_future(self.inner.borrow_mut().sender.terminate(result).map_err(|e| e.into()))
+        Promise::from_future(self.inner.borrow_mut().sender.terminate(result))
     }
 }
 

capnp/src/io.rs

@@ -17,13 +17,12 @@ pub trait Read {
 
     fn read_exact(&mut self, mut buf: &mut [u8]) -> Result<()> {
         while !buf.is_empty() {
-            match self.read(buf) {
-                Ok(0) => break,
-                Ok(n) => {
+            match self.read(buf)? {
+                0 => break,
+                n => {
                     let tmp = buf;
                     buf = &mut tmp[n..];
                 }
-                Err(e) => return Err(e.into()),
             }
         }
         if !buf.is_empty() {