From f9b220c558e5ac18ab62a0b83979b955f7553e1a Mon Sep 17 00:00:00 2001
From: Wind-Explorer <windexplorer@outlook.com>
Date: Thu, 15 Jan 2026 17:21:40 +0800
Subject: [PATCH] applied basic cargo clippy suggestions

---
 src-tauri/src/commands/app_data.rs    |  2 +-
 src-tauri/src/lib.rs                  | 13 +++++--------
 src-tauri/src/services/app_menu.rs    |  3 +--
 src-tauri/src/services/auth.rs        |  8 ++++----
 src-tauri/src/services/doll_editor.rs |  6 ++----
 5 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src-tauri/src/commands/app_data.rs b/src-tauri/src/commands/app_data.rs
index 5f644dd..bfec56c 100644
--- a/src-tauri/src/commands/app_data.rs
+++ b/src-tauri/src/commands/app_data.rs
@@ -7,7 +7,7 @@ use crate::{
 #[tauri::command]
 pub fn get_app_data() -> Result<AppData, String> {
     let guard = lock_r!(FDOLL);
-    return Ok(guard.app_data.clone());
+    Ok(guard.app_data.clone())
 }
 
 #[tauri::command]
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index eb8cbba..2b5f8ec 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -91,15 +91,12 @@ fn setup_fdoll() -> Result<(), tauri::Error> {
 }
 
 fn register_app_events(event: tauri::RunEvent) {
-    match event {
-        tauri::RunEvent::ExitRequested { api, code, .. } => {
-            if code.is_none() {
-                api.prevent_exit();
-            } else {
-                println!("exit code: {:?}", code);
-            }
+    if let tauri::RunEvent::ExitRequested { api, code, .. } = event {
+        if code.is_none() {
+            api.prevent_exit();
+        } else {
+            println!("exit code: {:?}", code);
         }
-        _ => {}
     }
 }
 
diff --git a/src-tauri/src/services/app_menu.rs b/src-tauri/src/services/app_menu.rs
index 5da95cb..c9a0799 100644
--- a/src-tauri/src/services/app_menu.rs
+++ b/src-tauri/src/services/app_menu.rs
@@ -38,7 +38,6 @@ pub fn open_app_menu_window() {
         }
         Err(e) => {
             error!("Failed to build {} window: {}", APP_MENU_WINDOW_LABEL, e);
-            return;
         }
-    };
+    }
 }
diff --git a/src-tauri/src/services/auth.rs b/src-tauri/src/services/auth.rs
index 45387f8..2ac03e4 100644
--- a/src-tauri/src/services/auth.rs
+++ b/src-tauri/src/services/auth.rs
@@ -108,7 +108,7 @@ fn generate_code_challenge(code_verifier: &str) -> String {
     let mut hasher = Sha256::new();
     hasher.update(code_verifier.as_bytes());
     let result = hasher.finalize();
-    URL_SAFE_NO_PAD.encode(&result)
+    URL_SAFE_NO_PAD.encode(result)
 }
 
 /// Returns the auth pass object, including
@@ -609,7 +609,7 @@ where
     let bind_addr = "localhost:0";
 
     info!("Attempting to bind to: {}", bind_addr);
-    let std_listener = match std::net::TcpListener::bind(&bind_addr) {
+    let std_listener = match std::net::TcpListener::bind(bind_addr) {
         Ok(s) => {
             s.set_nonblocking(true).unwrap();
             s
@@ -695,10 +695,10 @@ where
 
     if let Err(e) = app_handle.opener().open_url(url, None::<&str>) {
         error!("Failed to open auth portal: {}", e);
-        return Err(OAuthError::OpenPortalFailed(e));
+        Err(OAuthError::OpenPortalFailed(e))
     } else {
         info!("Successfully called open_url for auth portal");
-        return Ok(());
+        Ok(())
     }
 }
 
diff --git a/src-tauri/src/services/doll_editor.rs b/src-tauri/src/services/doll_editor.rs
index c283496..d71162d 100644
--- a/src-tauri/src/services/doll_editor.rs
+++ b/src-tauri/src/services/doll_editor.rs
@@ -86,10 +86,8 @@ pub async fn open_doll_editor_window(doll_id: Option<String>) {
                 if let Err(e) = window.emit("edit-doll", id) {
                     error!("Failed to emit edit-doll event: {}", e);
                 }
-            } else {
-                if let Err(e) = window.emit("create-doll", ()) {
-                    error!("Failed to emit create-doll event: {}", e);
-                }
+            } else if let Err(e) = window.emit("create-doll", ()) {
+                error!("Failed to emit create-doll event: {}", e);
             }
 
             return;