From 3ab5987b6746cc2d86cc3d1cae7278e68d6bc796 Mon Sep 17 00:00:00 2001 From: futile Date: Wed, 5 Nov 2025 00:08:53 +0000 Subject: [PATCH] use more `unwrap`s instead of `let _ =` --- src/features/empty_session.rs | 7 +++---- src/features/game_networking.rs | 2 +- src/features/launch.rs | 5 +++-- src/gui/app.rs | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/features/empty_session.rs b/src/features/empty_session.rs index 4f92415..7ac52c1 100644 --- a/src/features/empty_session.rs +++ b/src/features/empty_session.rs @@ -6,7 +6,7 @@ use crate::util::{ }; use std::time::{Duration, Instant}; use windows::Win32::{ - Foundation::{CloseHandle, HANDLE, NTSTATUS}, + Foundation::{HANDLE, NTSTATUS}, System::Threading::{OpenProcess, PROCESS_SUSPEND_RESUME}, }; @@ -70,13 +70,12 @@ pub fn activate(game_handle: &mut HANDLE, system_info: &mut SystemInfo) -> Resul return Err(()); } } - let _ = unsafe { NtSuspendProcess(*game_handle) }; + unsafe { NtSuspendProcess(*game_handle) }.unwrap(); Ok(()) } pub fn deactivate(game_handle: &mut HANDLE) { if !game_handle.is_invalid() { - let _ = unsafe { NtResumeProcess(*game_handle) }; - let _ = unsafe { CloseHandle(*game_handle) }; + unsafe { NtResumeProcess(*game_handle) }.unwrap(); } } diff --git a/src/features/game_networking.rs b/src/features/game_networking.rs index 827d62d..9468203 100644 --- a/src/features/game_networking.rs +++ b/src/features/game_networking.rs @@ -84,7 +84,7 @@ impl GameNetworking { (FILTER_NAME_IN, NET_FW_RULE_DIR_IN), (FILTER_NAME_OUT, NET_FW_RULE_DIR_OUT), ] { - let _ = unsafe { rules.Remove(&BSTR::from(filter.0)) }; + unsafe { rules.Remove(&BSTR::from(filter.0)) }.unwrap(); let rule: INetFwRule = unsafe { CoCreateInstance(&NetFwRule, None, CLSCTX_INPROC_SERVER) }.unwrap(); unsafe { rule.SetName(&BSTR::from(filter.0)) }.unwrap(); diff --git a/src/features/launch.rs b/src/features/launch.rs index 3d0835b..d905586 100644 --- a/src/features/launch.rs +++ b/src/features/launch.rs @@ -26,7 +26,7 @@ pub fn launch(platform: &Platform, version: &LaunchVersion) { LaunchVersion::Enhanced => "steam://run/3240220", LaunchVersion::Legacy => "steam://run/271590", }; - let _ = open::that_detached(steam_url); + open::that_detached(steam_url).unwrap(); } Platform::Rockstar => { let hklm = RegKey::predef(HKEY_LOCAL_MACHINE); @@ -44,6 +44,7 @@ pub fn launch(platform: &Platform, version: &LaunchVersion) { }; let mut play_gtav_path = PathBuf::from(install_folder); play_gtav_path.push("PlayGTAV.exe"); + // ignoring `Result` because if it errors that means GTA isn't installed via Rockstar let _ = Command::new(play_gtav_path).spawn(); } Platform::Epic => { @@ -55,7 +56,7 @@ pub fn launch(platform: &Platform, version: &LaunchVersion) { "com.epicgames.launcher://apps/9d2d0eb64d5c44529cece33fe2a46482?action=launch&silent=true" } }; - let _ = open::that_detached(epic_url); + open::that_detached(epic_url).unwrap(); } } } diff --git a/src/gui/app.rs b/src/gui/app.rs index 2d57f34..f0aacc7 100644 --- a/src/gui/app.rs +++ b/src/gui/app.rs @@ -243,8 +243,8 @@ impl App { .button("⬇") .on_hover_text("Go to current latest version."); if button.clicked() { - let _ = - open::that("https://github.com/elituf/gta-tools/releases/latest"); + open::that("https://github.com/elituf/gta-tools/releases/latest") + .unwrap(); } }); });