Merge pull request #291 from Tools-cx-app/offical/make-clippy-happy

Offical/make clippy happy

Author: shadow3aaa

Cargo.lock

@@ -30,7 +30,7 @@ repository = "https://github.com/shadow3aaa/fas-rs"
 
 [dependencies]
 likely_stable = "0.1.3"
-parking_lot = "0.12.4"
+parking_lot = "0.12.5"
 thiserror = "2.0.17"
 log = "0.4.28"
 anyhow = { version = "1.0.100" }

Cargo.toml

@@ -41,22 +41,19 @@ impl WindowsInfo {
     }
 
     fn parse_top_app(dump: &str) -> Vec<i32> {
-        let focused_app_line = match dump
+        let Some(focused_app_line) = dump
             .lines()
             .find(|line| line.trim().starts_with("mFocusedApp="))
-        {
-            Some(line) => line,
-            None => return Vec::new(),
+        else {
+            return Vec::new();
         };
-
-        let package_name = match Self::extract_package_name(focused_app_line) {
-            Some(name) => name,
-            None => return Vec::new(),
+        let Some(package_name) = Self::extract_package_name(focused_app_line) else {
+            return Vec::new();
         };
 
         // Try modern parser, if it fails, fall back to legacy parser.
-        let pid = Self::parse_a16_format(dump, &package_name)
-            .or_else(|| Self::parse_a15_format(dump, &package_name));
+        let pid = Self::parse_a16_format(dump, package_name)
+            .or_else(|| Self::parse_a15_format(dump, package_name));
 
         pid.map_or_else(Vec::new, |p| vec![p])
     }
@@ -73,11 +70,7 @@ impl WindowsInfo {
     fn parse_a16_format(dump: &str, package_name: &str) -> Option<i32> {
         let mut in_target_window_section = false;
         for line in dump.lines() {
-            if !in_target_window_section {
-                if line.contains("Window #") && line.contains(package_name) {
-                    in_target_window_section = true;
-                }
-            } else {
+            if in_target_window_section {
                 if line.contains("mSession=") {
                     let session_part = line.split("mSession=").nth(1)?;
                     let content_start = session_part.find('{')? + 1;
@@ -91,6 +84,8 @@ impl WindowsInfo {
                 if line.contains("Window #") {
                     return None;
                 }
+            } else if line.contains("Window #") && line.contains(package_name) {
+                in_target_window_section = true;
             }
         }
         None
@@ -111,12 +106,11 @@ impl WindowsInfo {
             }
 
             let trimmed_line = line.trim();
-            if trimmed_line.starts_with("mPackageName=") {
-                if let Some(pkg) = trimmed_line.split('=').nth(1) {
-                    if pkg == package_name {
-                        return last_pid_found;
-                    }
-                }
+            if trimmed_line.starts_with("mPackageName=")
+                && let Some(pkg) = trimmed_line.split('=').nth(1)
+                && pkg == package_name
+            {
+                return last_pid_found;
             }
         }
         None