clippy: replace is_err and is_some with if let

Clippy now complains about unnecessary wraps, so lets avoid them.

Signed-off-by: Sergio Lopez <[email protected]>

Author: slp

crates/muvm/src/guest/bridge/common.rs

@@ -982,11 +982,8 @@ pub fn bridge_loop<T: ProtocolHandler>(sock_path: &str) {
             let events = evt.events();
             if fd == listen_sock.as_raw_fd() as u64 {
                 let res = listen_sock.accept();
-                if res.is_err() {
-                    eprintln!(
-                        "Failed to accept a connection, error: {:?}",
-                        res.unwrap_err()
-                    );
+                if let Err(res) = res {
+                    eprintln!("Failed to accept a connection, error: {res:?}");
                     continue;
                 }
                 let stream = res.unwrap().0;

crates/muvm/src/guest/server_worker.rs

@@ -373,11 +373,8 @@ fn run_io_guest(
     let mut vsock = StdUnixStream::from(vsock_fd);
     let epoll = Epoll::new(EpollCreateFlags::empty())?;
     epoll.add(&stdout, EpollEvent::new(EpollFlags::EPOLLIN, 1))?;
-    if stderr.is_some() {
-        epoll.add(
-            stderr.as_ref().unwrap(),
-            EpollEvent::new(EpollFlags::EPOLLIN, 2),
-        )?;
+    if let Some(ref stderr) = stderr {
+        epoll.add(stderr, EpollEvent::new(EpollFlags::EPOLLIN, 2))?;
     }
     epoll.add(&vsock, EpollEvent::new(EpollFlags::EPOLLIN, 3))?;
     epoll.add(&stop_pipe, EpollEvent::new(EpollFlags::EPOLLIN, 4))?;

crates/muvm/src/hidpipe_server.rs

@@ -257,12 +257,8 @@ where
             return true;
         }
         let res = f(v);
-        if res.is_err() {
-            error!(
-                "Client {} disconnected with error: {:?}",
-                *k,
-                res.unwrap_err()
-            );
+        if let Err(res) = res {
+            error!("Client {} disconnected with error: {:?}", *k, res,);
             epoll.delete(&v.socket).unwrap();
             false
         } else {
@@ -277,12 +273,8 @@ where
 {
     let client = clients.get_mut(&fd).unwrap();
     let res = f(client);
-    if res.is_err() {
-        error!(
-            "Client {} disconnected with error: {:?}",
-            fd,
-            res.unwrap_err()
-        );
+    if let Err(res) = res {
+        error!("Client {} disconnected with error: {:?}", fd, res,);
         epoll.delete(&client.socket).unwrap();
         clients.remove(&fd);
     }
@@ -400,11 +392,8 @@ fn run(mut evdevs: EvdevContainer, listen_sock: UnixListener, epoll: Epoll) {
             }
         } else if fd == listen_sock.as_raw_fd() as u64 {
             let res = listen_sock.accept();
-            if res.is_err() {
-                error!(
-                    "Failed to accept a connection, error: {:?}",
-                    res.unwrap_err()
-                );
+            if let Err(res) = res {
+                error!("Failed to accept a connection, error: {:?}", res,);
                 continue;
             }
             let stream = res.unwrap().0;