langtool: Update, fix clippy warnings, just because

hrydgard · Mar 12, 2023 · ddab8fc · ddab8fc
1 parent 25fbfd7
commit ddab8fc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 21 deletions.
diff --git a/Tools/langtool/Cargo.lock b/Tools/langtool/Cargo.lock
diff --git a/Tools/langtool/Cargo.toml b/Tools/langtool/Cargo.toml
@@ -5,4 +5,4 @@ name = "langtool"
 version = "0.1.0"
 
 [dependencies]
-structopt = "0.3"
+structopt = "0.3.26"
diff --git a/Tools/langtool/src/main.rs b/Tools/langtool/src/main.rs
@@ -100,7 +100,7 @@ fn move_key(target_ini: &mut IniFile, old: &str, new: &str, key: &str) -> io::Re
 
 fn remove_key(target_ini: &mut IniFile, section: &str, key: &str) -> io::Result<()> {
     if let Some(old_section) = target_ini.get_section_mut(section) {
-        let _ = old_section.remove_line(key);
+        old_section.remove_line(key);
     } else {
         println!("No section {}", section);
     }
@@ -109,7 +109,7 @@ fn remove_key(target_ini: &mut IniFile, section: &str, key: &str) -> io::Result<
 
 fn add_new_key(target_ini: &mut IniFile, section: &str, key: &str) -> io::Result<()> {
     if let Some(section) = target_ini.get_section_mut(section) {
-        let _ = section.insert_line_if_missing(&format!("{} = {}", key, key));
+        section.insert_line_if_missing(&format!("{} = {}", key, key));
     } else {
         println!("No section {}", section);
     }
@@ -118,7 +118,7 @@ fn add_new_key(target_ini: &mut IniFile, section: &str, key: &str) -> io::Result
 
 fn rename_key(target_ini: &mut IniFile, section: &str, old: &str, new: &str) -> io::Result<()> {
     if let Some(section) = target_ini.get_section_mut(section) {
-        let _ = section.rename_key(old, new);
+        section.rename_key(old, new);
     } else {
         println!("No section {}", section);
     }
@@ -178,13 +178,13 @@ fn main() {
 
         match opt.cmd {
             Command::CopyMissingLines {} => {
-                copy_missing_lines(&reference_ini, &mut target_ini).unwrap();
+                copy_missing_lines(reference_ini, &mut target_ini).unwrap();
             }
             Command::CommentUnknownLines {} => {
-                deal_with_unknown_lines(&reference_ini, &mut target_ini, false).unwrap();
+                deal_with_unknown_lines(reference_ini, &mut target_ini, false).unwrap();
             }
             Command::RemoveUnknownLines {} => {
-                deal_with_unknown_lines(&reference_ini, &mut target_ini, true).unwrap();
+                deal_with_unknown_lines(reference_ini, &mut target_ini, true).unwrap();
             }
             Command::SortSection { ref section } => sort_section(&mut target_ini, section).unwrap(),
             Command::RenameKey {

diff --git a/Tools/langtool/src/section.rs b/Tools/langtool/src/section.rs
@@ -20,7 +20,7 @@ impl Section {
                 continue;
             };
 
-            if prefix.eq_ignore_ascii_case(&key) {
+            if prefix.eq_ignore_ascii_case(key) {
                 remove_index = Some(index);
                 break;
             }
@@ -140,11 +140,9 @@ impl Section {
             if prefix.starts_with("Font") || prefix.starts_with('#') {
                 return true;
             }
-            if !other.lines.iter().any(|line| line.starts_with(prefix)) {
-                false
-            } else {
-                true
-            }
+
+            // keeps the line if this expression returns true.
+            other.lines.iter().any(|line| line.starts_with(prefix))
         });
     }
 }