style: adjust the code according to clippy

Author: duskmoon314

src/cli.rs

@@ -108,9 +108,11 @@ impl Command {
                 out_path,
                 *input_format,
                 *output_format,
-                *expand,
-                *expand_properties,
-                *ignore_enums,
+                convert_cli::ParserConfig {
+                    expand: *expand,
+                    expand_properties: *expand_properties,
+                    ignore_enums: *ignore_enums,
+                },
                 format_config.as_ref().map(|p| p.as_path()),
             )?,
         }

src/convert/convert_cli.rs

@@ -18,7 +18,7 @@ impl FromStr for InputFormat {
             "svd" | "SVD" | "xml" | "XML" => Ok(Self::Xml),
             "yml" | "yaml" | "YAML" => Ok(Self::Yaml),
             "json" | "JSON" => Ok(Self::Json),
-            _ => return Err(anyhow!("Unknown input file format")),
+            _ => Err(anyhow!("Unknown input file format")),
         }
     }
 }
@@ -38,7 +38,7 @@ impl FromStr for OutputFormat {
             "svd" | "SVD" | "xml" | "XML" => Ok(Self::Xml),
             "yml" | "yaml" | "YAML" => Ok(Self::Yaml),
             "json" | "JSON" => Ok(Self::Json),
-            _ => return Err(anyhow!("Unknown output file format")),
+            _ => Err(anyhow!("Unknown output file format")),
         }
     }
 }
@@ -61,14 +61,18 @@ impl FromStr for ConfigFormat {
     }
 }
 
+pub struct ParserConfig {
+    pub expand: bool,
+    pub expand_properties: bool,
+    pub ignore_enums: bool,
+}
+
 pub fn convert(
     in_path: &Path,
     out_path: &Path,
     input_format: Option<InputFormat>,
     output_format: Option<OutputFormat>,
-    expand: bool,
-    expand_properties: bool,
-    ignore_enums: bool,
+    parser_config: ParserConfig,
     format_config: Option<&Path>,
 ) -> Result<()> {
     let input_format = match input_format {
@@ -92,15 +96,15 @@ pub fn convert(
     let mut device = match input_format {
         InputFormat::Xml => svd_parser::parse_with_config(
             &input,
-            &svd_parser::Config::default().ignore_enums(ignore_enums),
+            &svd_parser::Config::default().ignore_enums(parser_config.ignore_enums),
         )?,
         InputFormat::Yaml => serde_yaml::from_str(&input)?,
         InputFormat::Json => serde_json::from_str(&input)?,
     };
-    if expand_properties {
+    if parser_config.expand_properties {
         svd_parser::expand_properties(&mut device);
     }
-    let device = if expand {
+    let device = if parser_config.expand {
         svd_parser::expand(&device)?
     } else {
         device

src/patch/device.rs

@@ -19,14 +19,9 @@ pub struct PerIter<'a, 'b> {
 impl<'a, 'b> Iterator for PerIter<'a, 'b> {
     type Item = &'a mut Peripheral;
     fn next(&mut self) -> Option<Self::Item> {
-        for next in self.it.by_ref() {
-            if matchname(&next.name, self.spec)
-                && !(self.check_derived && next.derived_from.is_some())
-            {
-                return Some(next);
-            }
-        }
-        None
+        self.it.by_ref().find(|next| {
+            matchname(&next.name, self.spec) && !(self.check_derived && next.derived_from.is_some())
+        })
     }
 }
 

src/patch/iterators.rs

@@ -18,12 +18,9 @@ where
 {
     type Item = I::Item;
     fn next(&mut self) -> Option<Self::Item> {
-        for next in self.it.by_ref() {
-            if matchname(next.name(), self.spec) {
-                return Some(next);
-            }
-        }
-        None
+        self.it
+            .by_ref()
+            .find(|next| matchname(next.name(), self.spec))
     }
 }
 
@@ -60,7 +57,7 @@ where
     }
 }
 
-impl<'a, I> Iterator for OptIter<I>
+impl<I> Iterator for OptIter<I>
 where
     I: Iterator,
 {