unicode-table-gen: more clippy fixes

hkBst · hkBst · commit 4908ed5ff104 · 2025-07-18T13:51:18.000Z
diff --git a/src/tools/unicode-table-generator/src/main.rs b/src/tools/unicode-table-generator/src/main.rs
@@ -160,16 +160,14 @@ fn load_data() -> UnicodeData {
                 .push(Codepoints::Single(row.codepoint));
         }
 
-        if let Some(mapped) = row.simple_lowercase_mapping {
-            if mapped != row.codepoint {
+        if let Some(mapped) = row.simple_lowercase_mapping
+            && mapped != row.codepoint {
                 to_lower.insert(row.codepoint.value(), (mapped.value(), 0, 0));
             }
-        }
-        if let Some(mapped) = row.simple_uppercase_mapping {
-            if mapped != row.codepoint {
+        if let Some(mapped) = row.simple_uppercase_mapping
+            && mapped != row.codepoint {
                 to_upper.insert(row.codepoint.value(), (mapped.value(), 0, 0));
             }
-        }
     }
 
     for row in ucd_parse::parse::<_, ucd_parse::SpecialCaseMapping>(&UNICODE_DIRECTORY).unwrap() {

Original file line number	Diff line number	Diff line change
`@@ -160,16 +160,14 @@ fn load_data() -> UnicodeData {`
`160`	`160`	`.push(Codepoints::Single(row.codepoint));`
`161`	`161`	`}`
`162`	`162`
`163`		`- if let Some(mapped) = row.simple_lowercase_mapping {`
`164`		`- if mapped != row.codepoint {`
	`163`	`+ if let Some(mapped) = row.simple_lowercase_mapping`
	`164`	`+ && mapped != row.codepoint {`
`165`	`165`	`to_lower.insert(row.codepoint.value(), (mapped.value(), 0, 0));`
`166`	`166`	`}`
`167`		`- }`
`168`		`- if let Some(mapped) = row.simple_uppercase_mapping {`
`169`		`- if mapped != row.codepoint {`
	`167`	`+ if let Some(mapped) = row.simple_uppercase_mapping`
	`168`	`+ && mapped != row.codepoint {`
`170`	`169`	`to_upper.insert(row.codepoint.value(), (mapped.value(), 0, 0));`
`171`	`170`	`}`
`172`		`- }`
`173`	`171`	`}`
`174`	`172`
`175`	`173`	`for row in ucd_parse::parse::<_, ucd_parse::SpecialCaseMapping>(&UNICODE_DIRECTORY).unwrap() {`