From f74677bde2ea92c0677c04dea31de92a3bcb5c1c Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Fri, 12 Dec 2025 09:59:38 +0100 Subject: [PATCH 1/2] 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 --- crates/muvm/src/guest/bridge/common.rs | 7 ++----- crates/muvm/src/guest/server_worker.rs | 7 ++----- crates/muvm/src/hidpipe_server.rs | 23 ++++++----------------- 3 files changed, 10 insertions(+), 27 deletions(-) diff --git a/crates/muvm/src/guest/bridge/common.rs b/crates/muvm/src/guest/bridge/common.rs index 7cc54a8c..94a32f8c 100644 --- a/crates/muvm/src/guest/bridge/common.rs +++ b/crates/muvm/src/guest/bridge/common.rs @@ -982,11 +982,8 @@ pub fn bridge_loop(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; diff --git a/crates/muvm/src/guest/server_worker.rs b/crates/muvm/src/guest/server_worker.rs index 368a570b..58d60bad 100644 --- a/crates/muvm/src/guest/server_worker.rs +++ b/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))?; diff --git a/crates/muvm/src/hidpipe_server.rs b/crates/muvm/src/hidpipe_server.rs index 1c366f09..04022185 100644 --- a/crates/muvm/src/hidpipe_server.rs +++ b/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; From 1edf39f138f46a38106cfea287d728c48ee36c80 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Thu, 11 Dec 2025 22:53:50 +0100 Subject: [PATCH 2/2] Bump version to 0.5.0 Set up the stage for a new release. Signed-off-by: Sergio Lopez --- Cargo.lock | 2 +- crates/muvm/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 262cefba..5fed1745 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -553,7 +553,7 @@ dependencies = [ [[package]] name = "muvm" -version = "0.4.1" +version = "0.5.0" dependencies = [ "anyhow", "bpaf", diff --git a/crates/muvm/Cargo.toml b/crates/muvm/Cargo.toml index df87995d..bdaa9546 100644 --- a/crates/muvm/Cargo.toml +++ b/crates/muvm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "muvm" -version = "0.4.1" +version = "0.5.0" authors = ["Sergio Lopez ", "Teoh Han Hui ", "Sasha Finkelstein ", "Asahi Lina "] edition = "2021" rust-version = "1.80.0"