Merge pull request #292 from bugadani/patch-1

Fix typo & clippy

Author: burrbull

src/cli.rs

@@ -248,7 +248,7 @@ pub fn run() {
         .run()
         .with_context(|| format!("by svdtools ({})", clap::crate_version!()))
     {
-        log::error!("{:?}", e);
+        log::error!("{e:?}");
 
         std::process::exit(1);
     }

src/html/html_cli.rs

@@ -122,7 +122,7 @@ fn short_ra(ra: Option<ReadAction>) -> &'static str {
 
 trait GetI64 {
     fn get_i64(&self, key: &str) -> Option<i64>;
-    fn get_str(&self, key: &str) -> Option<Cow<str>>;
+    fn get_str(&self, key: &str) -> Option<Cow<'_, str>>;
 }
 
 impl GetI64 for Object {
@@ -131,7 +131,7 @@ impl GetI64 for Object {
             .and_then(|v| v.as_view().as_scalar())
             .and_then(|s| s.to_integer())
     }
-    fn get_str(&self, key: &str) -> Option<Cow<str>> {
+    fn get_str(&self, key: &str) -> Option<Cow<'_, str>> {
         self.get(key)
             .and_then(|v| v.as_view().as_scalar())
             .map(|s| s.into_cow_str())
@@ -508,7 +508,7 @@ fn parse_device(svdfile: impl AsRef<Path>) -> anyhow::Result<Object> {
 
 fn process_svd(svdfile: impl AsRef<Path>) -> anyhow::Result<Object> {
     let svdfile = svdfile.as_ref().to_str().unwrap();
-    println!("Processing {}", svdfile);
+    println!("Processing {svdfile}");
     parse_device(svdfile).with_context(|| format!("In file {svdfile}"))
 }
 

src/patch/iterators.rs

@@ -29,15 +29,15 @@ where
     Self: Iterator + Sized,
     Self::Item: Name,
 {
-    fn matched(self, spec: &str) -> MatchIter<Self>;
+    fn matched(self, spec: &str) -> MatchIter<'_, Self>;
 }
 
 impl<I> Matched for I
 where
     Self: Iterator + Sized,
     Self::Item: Name,
 {
-    fn matched(self, spec: &str) -> MatchIter<Self> {
+    fn matched(self, spec: &str) -> MatchIter<'_, Self> {
         MatchIter { it: self, spec }
     }
 }

src/patch/mod.rs

@@ -226,7 +226,7 @@ fn update_dict(parent: &mut Hash, child: &Hash) -> Result<()> {
                 if let Entry::Occupied(mut e) = parent.entry(key.clone()) {
                     match e.get_mut() {
                         el if el == val => {
-                            println!("In {key:?}: dublicate rule {val:?}, ignored");
+                            println!("In {key:?}: duplicate rule {val:?}, ignored");
                         }
                         Yaml::Array(a) => match val {
                             Yaml::Array(val) => {
@@ -236,7 +236,7 @@ fn update_dict(parent: &mut Hash, child: &Hash) -> Result<()> {
                                 if !a.contains(val) {
                                     a.push(val.clone());
                                 } else {
-                                    println!("In {key:?}: dublicate rule {val:?}, ignored");
+                                    println!("In {key:?}: duplicate rule {val:?}, ignored");
                                 }
                             }
                             _ => {}
@@ -251,7 +251,7 @@ fn update_dict(parent: &mut Hash, child: &Hash) -> Result<()> {
                                     a.insert(0, s.clone());
                                     e.insert(Yaml::Array(a));
                                 } else {
-                                    println!("In {key:?}: dublicate rule {s:?}, ignored");
+                                    println!("In {key:?}: duplicate rule {s:?}, ignored");
                                 }
                             }
                             s2 if matches!(s2, Yaml::String(_)) => {