From 70236f781cf303f8a4ea106258429775f6097e84 Mon Sep 17 00:00:00 2001
From: Tunglies <77394545+Tunglies@users.noreply.github.com>
Date: Thu, 6 Nov 2025 01:10:43 +0800
Subject: [PATCH] refactor: simplify uid assignment in PrfItem from_merge and
 from_script methods

---
 src-tauri/Cargo.toml            |  1 +
 src-tauri/src/config/prfitem.rs | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index db31304ed..78fd5b70e 100755
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -226,3 +226,4 @@ needless_raw_string_hashes = "deny" # Too many in existing code
 
 or_fun_call = "deny"
 cognitive_complexity = "deny"
+useless_let_if_seq = "deny"
diff --git a/src-tauri/src/config/prfitem.rs b/src-tauri/src/config/prfitem.rs
index a649333b0..a1ef64439 100644
--- a/src-tauri/src/config/prfitem.rs
+++ b/src-tauri/src/config/prfitem.rs
@@ -446,12 +446,11 @@ impl PrfItem {
     /// ## Merge type (enhance)
     /// create the enhanced item by using `merge` rule
     pub fn from_merge(uid: Option<String>) -> Result<PrfItem> {
-        let mut id = help::get_uid("m").into();
-        let mut template = tmpl::ITEM_MERGE_EMPTY.into();
-        if let Some(uid) = uid {
-            id = uid;
-            template = tmpl::ITEM_MERGE.into();
-        }
+        let (id, template) = if let Some(uid) = uid {
+            (uid, tmpl::ITEM_MERGE.into())
+        } else {
+            (help::get_uid("m").into(), tmpl::ITEM_MERGE_EMPTY.into())
+        };
         let file = format!("{id}.yaml").into();
 
         Ok(PrfItem {
@@ -473,12 +472,12 @@ impl PrfItem {
     /// ## Script type (enhance)
     /// create the enhanced item by using javascript quick.js
     pub fn from_script(uid: Option<String>) -> Result<PrfItem> {
-        let mut id = help::get_uid("s").into();
-        if let Some(uid) = uid {
-            id = uid;
-        }
+        let id = if let Some(uid) = uid {
+            uid
+        } else {
+            help::get_uid("s").into()
+        };
         let file = format!("{id}.js").into(); // js ext
-
         Ok(PrfItem {
             uid: Some(id),
             itype: Some("script".into()),