diff --git a/src/netplay.rs b/src/netplay.rs index 95e7c9a0..24c53d25 100644 --- a/src/netplay.rs +++ b/src/netplay.rs @@ -182,7 +182,7 @@ fn request_input(netplay: &Netplay, channel: usize) { fn process_incoming(netplay: &mut Netplay) { let mut buf: [u8; 1024] = [0; 1024]; - while let Ok(_incoming) = netplay.udp_socket.recv(&mut buf) { + while netplay.udp_socket.recv(&mut buf).is_ok() { match buf[0] { UDP_RECEIVE_KEY_INFO | UDP_RECEIVE_KEY_INFO_GRATUITOUS => { let player = buf[1] as usize; diff --git a/src/ui/cheats.rs b/src/ui/cheats.rs index fa47cbcf..dcafb41a 100644 --- a/src/ui/cheats.rs +++ b/src/ui/cheats.rs @@ -8,10 +8,7 @@ use slint::ComponentHandle; pub fn cheats_window(app: &AppWindow) { let weak = app.as_weak(); app.on_cheats_select_rom_clicked(move |rom_dir| { - let select_rom = if !rom_dir.is_empty() - && let Ok(exists) = std::fs::exists(&rom_dir) - && exists - { + let select_rom = if !rom_dir.is_empty() && std::fs::exists(&rom_dir).unwrap_or(false) { rfd::AsyncFileDialog::new().set_directory(rom_dir) } else { rfd::AsyncFileDialog::new() diff --git a/src/ui/gui.rs b/src/ui/gui.rs index dfb7665b..ad1a31f0 100644 --- a/src/ui/gui.rs +++ b/src/ui/gui.rs @@ -607,8 +607,7 @@ pub fn run_rom( for rom in handle.get_recent_roms().iter() { if rom.0 != file_path.to_str().unwrap() && recent_roms.row_count() < 5 - && let Ok(exists) = std::fs::exists(&rom.0) - && exists + && std::fs::exists(&rom.0).unwrap_or(false) { recent_roms.push(rom); } @@ -623,10 +622,7 @@ pub fn run_rom( fn open_rom(app: &AppWindow) { let rom_dir = app.get_rom_dir(); - let select_rom = if !rom_dir.is_empty() - && let Ok(exists) = std::fs::exists(&rom_dir) - && exists - { + let select_rom = if !rom_dir.is_empty() && std::fs::exists(&rom_dir).unwrap_or(false) { rfd::AsyncFileDialog::new().set_directory(rom_dir) } else { rfd::AsyncFileDialog::new() diff --git a/src/ui/netplay.rs b/src/ui/netplay.rs index 889c7a7a..8f5d6d1b 100644 --- a/src/ui/netplay.rs +++ b/src/ui/netplay.rs @@ -118,7 +118,7 @@ fn populate_server_names(weak: slin if let Ok(broadcast_sock) = tokio::net::UdpSocket::bind((std::net::Ipv4Addr::UNSPECIFIED, 0)).await - && let Ok(_) = broadcast_sock.set_broadcast(true) + && broadcast_sock.set_broadcast(true).is_ok() { let data: [u8; 1] = [1]; if let Err(e) = broadcast_sock @@ -177,10 +177,7 @@ fn select_rom( weak: slint::Weak, rom_dir: slint::SharedString, ) { - let select_rom = if !rom_dir.is_empty() - && let Ok(exists) = std::fs::exists(&rom_dir) - && exists - { + let select_rom = if !rom_dir.is_empty() && std::fs::exists(&rom_dir).unwrap_or(false) { rfd::AsyncFileDialog::new().set_directory(rom_dir) } else { rfd::AsyncFileDialog::new() diff --git a/src/ui/storage.rs b/src/ui/storage.rs index f2e832e1..cf87d561 100644 --- a/src/ui/storage.rs +++ b/src/ui/storage.rs @@ -343,7 +343,7 @@ pub fn decompress_file(input: &[u8], name: &str) -> Result, zip::result: { if let Ok(mut reader) = zip::ZipArchive::new(std::io::Cursor::new(input)) && let Ok(mut file) = reader.by_name(name) - && let Ok(_) = file.read_to_end(&mut decompressed_file) + && file.read_to_end(&mut decompressed_file).is_ok() { return Ok(decompressed_file); }