From 6935b852ce9ccdcaba7a1f7e4203f571aee61b46 Mon Sep 17 00:00:00 2001
From: futile <git@futile.eu>
Date: Thu, 17 Apr 2025 01:31:49 +0100
Subject: [PATCH] clippy

---
 src/features/anti_afk.rs      | 14 ++++++--------
 src/features/empty_session.rs |  2 +-
 src/gui/mod.rs                | 17 ++++++++++-------
 src/util/countdown.rs         |  2 +-
 src/util/win.rs               |  2 +-
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/features/anti_afk.rs b/src/features/anti_afk.rs
index 0c58245..854938a 100644
--- a/src/features/anti_afk.rs
+++ b/src/features/anti_afk.rs
@@ -25,21 +25,19 @@ impl Default for AntiAfk {
 }
 
 impl AntiAfk {
-    pub fn can_activate(&self) -> bool {
-        use util::win::*;
-        is_window_focused(GTA_WINDOW_TITLE)
-            && !is_any_key_pressed(&PRESS_KEYS)
-            && !is_cursor_visible()
-    }
-
     pub fn activate(&mut self) {
-        if self.can_activate() {
+        if can_activate() {
             send(&PRESS_KEYS);
         }
         self.interval = Instant::now();
     }
 }
 
+pub fn can_activate() -> bool {
+    use util::win::{is_any_key_pressed, is_cursor_visible, is_window_focused};
+    is_window_focused(GTA_WINDOW_TITLE) && !is_any_key_pressed(&PRESS_KEYS) && !is_cursor_visible()
+}
+
 pub fn send(vk_codes: &[u8]) {
     vk_codes.iter().for_each(|vk_code: &u8| unsafe {
         keybd_event(
diff --git a/src/features/empty_session.rs b/src/features/empty_session.rs
index fefc36b..36b96ca 100644
--- a/src/features/empty_session.rs
+++ b/src/features/empty_session.rs
@@ -41,7 +41,7 @@ fn get_gta_pid(sysinfo: &mut System) -> u32 {
         .find(|(_, p)| p.name() == ENHANCED || p.name() == LEGACY)
     {
         return pid.as_u32();
-    };
+    }
     u32::MAX
 }
 
diff --git a/src/gui/mod.rs b/src/gui/mod.rs
index 6527528..a0378d7 100644
--- a/src/gui/mod.rs
+++ b/src/gui/mod.rs
@@ -154,7 +154,7 @@ impl App {
         ui.horizontal(|ui| {
             if ui.button("Launch").clicked() {
                 features::launch::launch(&self.launch.selected);
-            };
+            }
             build_combo_box::<features::launch::Platform>(ui, &mut self.launch.selected, "Launch");
         });
         let force_close_button = ui.add_sized(
@@ -164,7 +164,7 @@ impl App {
         if force_close_button.clicked() && !self.force_close.prompting {
             self.force_close.prompting();
             self.flags.current_frame = true;
-        };
+        }
         if self.force_close.prompting
             && self.force_close.interval.elapsed() <= Duration::from_secs(3)
         {
@@ -228,13 +228,13 @@ impl App {
                             .clicked()
                         {
                             features::game_networking::block_all(&mut self.sysinfo);
-                        };
+                        }
                         if ui
                             .add_sized([button_width, 18.0], egui::Button::new("Unblock"))
                             .clicked()
                         {
                             features::game_networking::unblock_all();
-                        };
+                        }
                     });
                 });
                 response.response.on_disabled_hover_text(
@@ -277,13 +277,16 @@ impl App {
     fn show_debug(&mut self, _ctx: &egui::Context, ui: &mut egui::Ui) {
         if ui.button("open storage path").clicked() {
             open::that_detached(APP_STORAGE_PATH.as_path()).unwrap();
-        };
+        }
         ui.collapsing("anti afk", |ui| {
             ui.label(format!(
                 "timer: {}",
                 self.anti_afk.interval.elapsed().as_secs()
             ));
-            ui.label(format!("can activate: {}", self.anti_afk.can_activate()));
+            ui.label(format!(
+                "can activate: {}",
+                features::anti_afk::can_activate()
+            ));
         });
         ui.collapsing("sysinfo", |ui| {
             if ui.button("refresh all").clicked() {
@@ -399,7 +402,7 @@ fn app_creator(
     if let Some(persistent_state) = PersistentState::get() {
         app.launch.selected = persistent_state.launcher;
         app.settings = persistent_state.settings;
-    };
+    }
     let elevated = util::win::is_elevated();
     if app.settings.start_elevated && !elevated {
         util::win::elevate(util::win::ElevationExitMethod::Forced);
diff --git a/src/util/countdown.rs b/src/util/countdown.rs
index be0b81c..408ca86 100644
--- a/src/util/countdown.rs
+++ b/src/util/countdown.rs
@@ -36,6 +36,6 @@ impl Countdown {
         self.i_string = self.i.to_string();
         if self.i == 0 {
             self.reset();
-        };
+        }
     }
 }
diff --git a/src/util/win.rs b/src/util/win.rs
index 3dfb931..29f446d 100644
--- a/src/util/win.rs
+++ b/src/util/win.rs
@@ -22,7 +22,7 @@ pub enum ElevationExitMethod<'a> {
 
 pub fn is_cursor_visible() -> bool {
     let mut ci = CURSORINFO {
-        cbSize: std::mem::size_of::<CURSORINFO>() as u32,
+        cbSize: u32::try_from(std::mem::size_of::<CURSORINFO>()).unwrap(),
         ..Default::default()
     };
     unsafe {