clippy

Author: tadghh

Cargo.lock

@@ -6,7 +6,7 @@ keywords   =["transparency", "windows"]
 name       ="win_alpha"
 readme     ="readme.md"
 repository ="https://github.com/tadghh/transparent-windows"
-version    ="1.2.8"
+version    ="1.2.9"
 
 [[bin]]
 name="win_alpha"

Cargo.toml

@@ -104,7 +104,7 @@ impl AppState {
         let config_json = serde_json::to_string_pretty(&config.to_owned())?;
         self.config_tx.send(config.to_owned())?;
 
-        fs::write(&self.get_config_path(), config_json)?;
+        fs::write(self.get_config_path(), config_json)?;
 
         Ok(())
     }
@@ -152,7 +152,7 @@ impl AppState {
         let config_json = serde_json::to_string_pretty(&config.to_owned())?;
         self.config_tx.send(config.to_owned())?;
 
-        fs::write(&self.get_config_path(), config_json)?;
+        fs::write(self.get_config_path(), config_json)?;
 
         Ok(())
     }

src/app_state.rs

@@ -2,6 +2,11 @@ use crate::{app_state::AppState, util::Config, win_utils::make_window_transparen
 use core::time::Duration;
 use std::{collections::HashMap, os::raw::c_void, sync::Arc};
 use windows::Win32::{Foundation::HWND, UI::WindowsAndMessaging::IsWindow};
+
+// Delays between window monitor runs
+// new windows, window updates etc.
+const MONITOR_DELAY: u64 = 120;
+
 #[derive(Eq, PartialEq, Clone, Debug)]
 struct WindowHandleState {
     handle: isize,
@@ -47,7 +52,7 @@ impl WindowHandleState {
 
     pub fn update_window(&mut self, mut new_transparency: u8, enabled: bool) {
         let real_transparency = new_transparency;
-        if enabled == false {
+        if !enabled {
             new_transparency = 255;
         }
         if make_window_transparent(self.get_handle(), new_transparency).is_ok() {
@@ -61,7 +66,7 @@ impl WindowHandleState {
 */
 #[inline(always)]
 pub async fn monitor_windows(app_state: Arc<AppState>) {
-    let refresh_interval = Duration::from_millis(160);
+    let refresh_interval = Duration::from_millis(MONITOR_DELAY);
 
     let mut config = app_state.get_config().await;
     let mut is_enabled = app_state.is_enabled().await;

src/monitor.rs

@@ -41,7 +41,7 @@ fn add_tray_menu_item(
     message: Message,
 ) -> Result<(), TIError> {
     let tx_clone = tx.clone();
-    tray.add_menu_item(&label, move || {
+    tray.add_menu_item(label, move || {
         if let Err(e) = tx_clone.send(message.clone()) {
             eprintln!("Failed to send {} message: {}", label, e);
         }

src/tray.rs

@@ -100,20 +100,19 @@ pub fn create_config_error_window(config_path: PathBuf) -> Result<(), Error> {
             if let Ok(config_json) = serde_json::to_string_pretty(&[serde_json::json!({})])
                 && let Ok(config_clone) = config_clone.lock()
             {
-                fs::write(&config_clone.as_str(), config_json).expect("better not.");
+                fs::write(config_clone.as_str(), config_json).expect("better not.");
             } else {
                 _ = anyhow!("AHHHHH failed to lock/write config!!!");
             }
         }
     });
 
     window.on_cancel(move || {
-        if !*action_taken_clone.lock().unwrap() {
-            if let Ok(config_clone) = config_clone_cancel.lock()
-                && let Ok(config_json) = serde_json::to_string_pretty(&[serde_json::json!({})])
-            {
-                fs::write(config_clone.as_str(), config_json).expect("better not.");
-            }
+        if !*action_taken_clone.lock().unwrap()
+            && let Ok(config_clone) = config_clone_cancel.lock()
+            && let Ok(config_json) = serde_json::to_string_pretty(&[serde_json::json!({})])
+        {
+            fs::write(config_clone.as_str(), config_json).expect("better not.");
         }
 
         if let Some(handle) = window_handle.upgrade() {

src/util.rs

@@ -315,7 +315,7 @@ fn is_elevated(point: POINT) -> bool {
 
     unsafe {
         let hwnd = WindowFromPoint(point);
-        if hwnd.0 == std::ptr::null_mut() {
+        if hwnd.0.is_null() {
             return false;
         }
 
@@ -362,7 +362,7 @@ fn is_running_as_admin() -> bool {
             size,
             &mut size,
         )
-        .map_or(false, |_| elevation.TokenIsElevated != 0)
+        .is_ok_and(|_| elevation.TokenIsElevated != 0)
     }
 }
 
@@ -448,6 +448,6 @@ pub fn get_startup_state() -> bool {
             Some(&mut size),
         );
 
-        return result == ERROR_SUCCESS;
+        result == ERROR_SUCCESS
     }
 }

src/win_utils.rs

@@ -221,7 +221,7 @@ fn find_window_by_class(target_class: &str) -> windows::core::Result<Option<HWND
     unsafe extern "system" fn enum_windows_proc(parent_hwnd: HWND, lparam: LPARAM) -> BOOL {
         let state = &mut *(lparam.0 as *mut SearchState);
         let _ = EnumChildWindows(Some(parent_hwnd), Some(enum_child_windows_proc), lparam);
-        (!state.found_hwnd.is_some()).into()
+        (state.found_hwnd.is_none()).into()
     }
 
     fn find_topmost_parent(hwnd: HWND) -> Option<HWND> {
@@ -282,7 +282,7 @@ impl From<TransparencyRule> for WindowConfig {
         WindowConfig {
             process_name: config.process_name.to_owned().into(),
             window_class: config.window_class.to_owned().into(),
-            transparency: convert_to_full(config.transparency.try_into().unwrap_or(100)),
+            transparency: convert_to_full(config.transparency),
             enabled: config.enabled,
             force: config.force,
             old_class: if config.old_class.is_empty() {