Appease the mighty cargo clippy

Author: Assumeru

build.rs

@@ -192,10 +192,10 @@ fn write_bodyparts(path: PathBuf) -> Result<(), Box<dyn Error>> {
     -> (Vec<(&'static str, Vec<Vec<FieldRule>>)>,
     Vec<(&'static str, Option<&'static str>, Option<Vec<Vec<FieldRule>>>)>,
     Vec<(&'static str, Option<&'static str>, Option<Vec<Vec<FieldRule>>>)>) {
-        return ",
+        ",
     )?;
     data.write_to_file(&mut file)?;
-    file.write_all(b"; }")?;
+    file.write_all(b" }")?;
     Ok(())
 }
 
@@ -241,7 +241,7 @@ fn write_classes(path: PathBuf) -> Result<(), Box<dyn Error>> {
         }
         write_string_map_insert(&mut file, "classes", lower, &class.data)?;
     }
-    file.write_all(b"return (tr_classes, classes); }")?;
+    file.write_all(b"(tr_classes, classes) }")?;
     Ok(())
 }
 
@@ -257,15 +257,15 @@ fn write_broken(path: PathBuf) -> Result<(), Box<dyn Error>> {
     for (key, value) in &broken {
         write_string_map_insert(&mut file, "broken", key.to_ascii_lowercase(), value)?;
     }
-    file.write_all(b"return broken; }")?;
+    file.write_all(b"broken }")?;
     Ok(())
 }
 
 fn write_mwscript(path: PathBuf) -> Result<(), Box<dyn Error>> {
     let mut file = File::create(path)?;
     file.write_all(
         br#"fn get_joined_commands() -> &'static str {
-        return r""#,
+        r""#,
     )?;
     let mut first = true;
     for command in include_str!("./data/mwscript.returning.txt").split_whitespace() {
@@ -277,19 +277,19 @@ fn write_mwscript(path: PathBuf) -> Result<(), Box<dyn Error>> {
         file.write_all(command.as_bytes())?;
     }
     file.write_all(
-        br##""; }
+        br##"" }
     fn get_khajiit_script() -> &'static str {
-        return "##,
+        "##,
     )?;
     let khajiit_input = include_str!("./data/khajiit.mwscript")
-        .replace("(", r"\(")
-        .replace(")", r"\)")
-        .replace("\n", r"\s*((;.*)?\n)+\s*");
+        .replace('(', r"\(")
+        .replace(')', r"\)")
+        .replace('\n', r"\s*((;.*)?\n)+\s*");
     Regex::new(r"\s+")?
         .replace_all(&khajiit_input, r"\s+")
         .to_string()
         .write_to_file(&mut file)?;
-    file.write_all(b"; }")?;
+    file.write_all(b" }")?;
     Ok(())
 }
 
@@ -317,10 +317,10 @@ fn write_projects(path: PathBuf) -> Result<(), Box<dyn Error>> {
     let mut file = File::create(path)?;
     file.write_all(
         br"fn get_project_data() -> Vec<Project> {
-        return ",
+        ",
     )?;
     projects.write_to_file(&mut file)?;
-    file.write_all(b"; }")?;
+    file.write_all(b" }")?;
     Ok(())
 }
 
@@ -342,7 +342,7 @@ fn write_services(path: PathBuf) -> Result<(), Box<dyn Error>> {
         class.to_ascii_lowercase().write_to_file(&mut file)?;
         file.write_all(b"));\n")?;
     }
-    file.write_all(b"return barter_classes; }")?;
+    file.write_all(b"barter_classes }")?;
     Ok(())
 }
 
@@ -427,7 +427,7 @@ fn write_spells(path: PathBuf) -> Result<(), Box<dyn Error>> {
         id.to_ascii_lowercase().write_to_file(&mut file)?;
         file.write_all(b", (never.clone(), none.clone()));\n")?;
     }
-    file.write_all(br"return spells; }")?;
+    file.write_all(br"spells }")?;
     Ok(())
 }
 
@@ -444,7 +444,7 @@ fn write_supplies(path: PathBuf) -> Result<(), Box<dyn Error>> {
     for (key, value) in &supplies {
         write_string_map_insert(&mut file, "supplies", key.to_ascii_lowercase(), value)?;
     }
-    file.write_all(b"return supplies; }")?;
+    file.write_all(b"supplies }")?;
     Ok(())
 }
 
@@ -461,7 +461,7 @@ fn write_travel(path: PathBuf) -> Result<(), Box<dyn Error>> {
         class.to_ascii_lowercase().write_to_file(&mut file)?;
         file.write_all(b");\n")?;
     }
-    file.write_all(b"return travel_classes; }")?;
+    file.write_all(b"travel_classes }")?;
     Ok(())
 }
 
@@ -480,5 +480,5 @@ fn write_uniques(path: PathBuf) -> Result<(), io::Error> {
             file.write_all(b");\n")?;
         }
     }
-    file.write_all(b"return uniques; }")
+    file.write_all(b"uniques }")
 }

src/extended/items.rs

@@ -75,9 +75,7 @@ impl ExtendedHandler for OwnershipValidator {
                     if scale != 1. && self.items.contains(&lower) {
                         println!(
                             "Cell {} contains {} with scale {}",
-                            name,
-                            reference.id,
-                            scale
+                            name, reference.id, scale
                         );
                     }
 

src/extended/weapons.rs

@@ -37,7 +37,7 @@ impl ExtendedHandler for WeaponValidator {
                 } else if base.ignores.is_none() && weapon.enchanting.is_empty() {
                     base.silver = silver;
                     base.ignores = ignores;
-                    base.id = weapon.id.clone();
+                    weapon.id.clone_into(&mut base.id);
                 } else if last {
                     if base.silver != silver {
                         println!(

src/validators/orphans.rs

@@ -172,17 +172,17 @@ impl Handler<'_> for OrphanValidator {
         }
         if let Some(captures) = self.startscript.captures(code) {
             let id = captures.get(2).unwrap().as_str();
-            self.start_scripts.push(id.replace("\"", ""));
+            self.start_scripts.push(id.replace('"', ""));
         } else if let Some(captures) = self.firstarg.captures(code) {
             if let Some(quoted) = captures.get(3) {
-                self.used_objects.insert(quoted.as_str().replace("\"", ""));
+                self.used_objects.insert(quoted.as_str().replace('"', ""));
             } else if let Some(unquoted) = captures.get(4) {
                 self.used_objects.insert(unquoted.as_str().to_string());
             }
         } else if let Some(captures) = self.journal.captures(code) {
             let id;
             if let Some(quoted) = captures.get(3) {
-                id = quoted.as_str().replace("\"", "");
+                id = quoted.as_str().replace('"', "");
             } else if let Some(unquoted) = captures.get(4) {
                 id = unquoted.as_str().to_string();
             } else {
@@ -193,7 +193,7 @@ impl Handler<'_> for OrphanValidator {
             }
         } else if let Some(captures) = self.secondarg.captures(code) {
             self.used_objects
-                .insert(captures.get(4).unwrap().as_str().replace("\"", ""));
+                .insert(captures.get(4).unwrap().as_str().replace('"', ""));
         }
     }
 

src/validators/travel.rs

@@ -22,7 +22,7 @@ struct Caravaner<'a> {
 }
 
 fn get_town_name(id: &str) -> &str {
-    if let Some((prefix, _)) = id.split_once(",") {
+    if let Some((prefix, _)) = id.split_once(',') {
         return prefix;
     }
     id