clean code

Author: CppCXY

tools/std_i18n/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "std_i18n"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 # local

tools/std_i18n/src/comment_syntax.rs

@@ -181,10 +181,10 @@ pub fn build_tag_line_indexes(raw: &str, lines: &[LineInfo]) -> TagLineIndexes {
             return_lines.push(i);
             continue;
         }
-        if t.starts_with("---|") {
-            if let Some(value) = parse_union_item_value_from_line_trim(t) {
-                union_line.entry(value).or_insert(i);
-            }
+        if t.starts_with("---|")
+            && let Some(value) = parse_union_item_value_from_line_trim(t)
+        {
+            union_line.entry(value).or_insert(i);
         }
     }
 

tools/std_i18n/src/extractor.rs

@@ -110,12 +110,12 @@ pub fn analyze_lua_doc_file(
         let has_owner = comment.get_owner().is_some();
 
         let mut effective_version = direct_version.clone();
-        if effective_version.is_none() {
-            if let Some((pending, pending_end)) = pending_version.as_ref() {
-                if has_owner && is_whitespace_between(content, *pending_end, start) {
-                    effective_version = Some(pending.clone());
-                }
-            }
+        if effective_version.is_none()
+            && let Some((pending, pending_end)) = pending_version.as_ref()
+            && has_owner
+            && is_whitespace_between(content, *pending_end, start)
+        {
+            effective_version = Some(pending.clone());
         }
 
         for symbol in root_symbols_for_comment(&comment, &raw_comment) {
@@ -687,10 +687,10 @@ fn preprocess_description(description: &str) -> String {
 
         if let Some(true) = start_with_one_space {
             let mut chars = line.chars();
-            if let Some(first) = chars.next() {
-                if first.is_whitespace() {
-                    line = chars.as_str();
-                }
+            if let Some(first) = chars.next()
+                && first.is_whitespace()
+            {
+                line = chars.as_str();
             }
         }
 
@@ -706,11 +706,11 @@ fn extract_version_suffix(comment: &LuaComment, raw_comment: &str) -> Option<Str
     for tag in comment.get_doc_tags() {
         if let LuaDocTag::Version(version_tag) = tag {
             let raw = version_tag.syntax().text().to_string();
-            if let Some(remainder) = extract_version_remainder(&raw) {
-                if !remainder.is_empty() {
-                    let compact = remainder.split_whitespace().collect::<String>();
-                    return Some(format!("@{compact}"));
-                }
+            if let Some(remainder) = extract_version_remainder(&raw)
+                && !remainder.is_empty()
+            {
+                let compact = remainder.split_whitespace().collect::<String>();
+                return Some(format!("@{compact}"));
             }
         }
     }

tools/std_i18n/src/keys.rs

@@ -57,10 +57,10 @@ pub fn map_symbol_for_locale_key(symbol: &str, module_map: &HashMap<String, Stri
     if let Some(class) = module_map.get(symbol) {
         s = class.clone();
     }
-    if let Some((first, rest)) = s.split_once('.') {
-        if let Some(class) = module_map.get(first) {
-            s = format!("{class}.{rest}");
-        }
+    if let Some((first, rest)) = s.split_once('.')
+        && let Some(class) = module_map.get(first)
+    {
+        s = format!("{class}.{rest}");
     }
     s.replace(':', ".")
 }

tools/std_i18n/src/translator.rs

@@ -1,6 +1,6 @@
 use crate::comment_syntax::{
-    build_tag_line_indexes, is_doc_tag_line, normalize_optional_name, split_lines_with_offsets,
-    LineInfo,
+    LineInfo, build_tag_line_indexes, is_doc_tag_line, normalize_optional_name,
+    split_lines_with_offsets,
 };
 use crate::extractor::analyze_lua_doc_file;
 use crate::model::{ExtractedEntry, ExtractedKind, SourceSpan};
@@ -193,10 +193,10 @@ fn tag_attached_replace_target_after(
         return Some(inline);
     }
 
-    if raw_desc.trim().is_empty() {
-        if let Some(insert) = inline_tag_description_insert_target(ctx, comment_span, tag_idx) {
-            return Some(insert);
-        }
+    if raw_desc.trim().is_empty()
+        && let Some(insert) = inline_tag_description_insert_target(ctx, comment_span, tag_idx)
+    {
+        return Some(insert);
     }
 
     attached_doc_block_target_after(ctx, comment_span, tag_idx, file_content)