Merge pull request #242 from therealprof/branch/more-uncontroversial-clippy-lints

More clippy lint fixes which should be uncontroversial

CI built successfully, merging manually.

Author: therealprof

src/generate/interrupt.rs

@@ -310,7 +310,7 @@ pub fn render(
         }
     }
 
-    if interrupts.len() > 0 {
+    if !interrupts.is_empty() {
         root.push(quote! {
             #[doc(hidden)]
             pub mod interrupt {

src/generate/peripheral.rs

@@ -143,7 +143,7 @@ impl Region {
             // Sort by length and then content
             match a.len().cmp(&b.len()) {
                 Ordering::Equal => a.cmp(b),
-                cmp @ _ => cmp
+                cmp => cmp
             }
         });
         Some(idents[0].to_owned())
@@ -188,12 +188,12 @@ impl Region {
             .map(|i| split_keep(i))
             .collect();
         let mut index = 0;
-        let first = x.get(0).unwrap();
+        let first = &x[0];
         // Get first elem, check against all other, break on mismatch
         'outer: while index < first.len() {
             for ident_match in x.iter().skip(1) {
                 if let Some(match_) = ident_match.get(index) {
-                    if match_ != first.get(index).unwrap() {
+                    if match_ != &first[index] {
                         break 'outer;
                     }
                 } else {
@@ -205,7 +205,7 @@ impl Region {
         if index <= 1 {
             None
         } else {
-            if first.get(index).is_some() && first.get(index).unwrap().chars().all(|c| c.is_numeric()) {
+            if first.get(index).is_some() && first[index].chars().all(|c| c.is_numeric()) {
                 Some(first.iter().take(index).cloned().collect())
             } else {
                 Some(first.iter().take(index - 1).cloned().collect())
@@ -231,7 +231,7 @@ impl Region {
             // This isn't a foolproof way of emitting the most
             // reasonable short description, but it's good enough.
             if f.description != result {
-                if result.len() > 0 {
+                if !result.is_empty() {
                     result.push(' ');
                 }
                 result.push_str(&f.description);
@@ -553,8 +553,8 @@ fn expand(
 
     for erc in ercs {
         ercs_expanded.extend(match erc {
-            &Either::Left(ref register) => expand_register(register, defs, name)?,
-            &Either::Right(ref cluster) => expand_cluster(cluster, defs)?,
+            Either::Left(ref register) => expand_register(register, defs, name)?,
+            Either::Right(ref cluster) => expand_cluster(cluster, defs)?,
         });
     }
 
@@ -806,9 +806,9 @@ fn expand_svd_register(register: &Register, name: Option<&str>) -> Vec<syn::Fiel
 
             for (idx, _i) in indices.iter().zip(0..) {
                 let nb_name = if has_brackets {
-                    info.name.replace("[%s]", format!("{}", idx).as_str())
+                    info.name.replace("[%s]", idx)
                 } else {
-                    info.name.replace("%s", format!("{}", idx).as_str())
+                    info.name.replace("%s", idx)
                 };
 
                 let ty_name = if has_brackets {
@@ -930,9 +930,9 @@ fn expand_svd_cluster(cluster: &Cluster) -> Vec<syn::Field> {
 
             for (idx, _i) in indices.iter().zip(0..) {
                 let name = if has_brackets {
-                    info.name.replace("[%s]", format!("{}", idx).as_str())
+                    info.name.replace("[%s]", idx)
                 } else {
-                    info.name.replace("%s", format!("{}", idx).as_str())
+                    info.name.replace("%s", idx)
                 };
 
                 let ty_name = if has_brackets {

src/generate/register.rs

@@ -106,7 +106,7 @@ pub fn render(
         let rv = register
             .reset_value
             .or(defs.reset_value)
-            .map(|rv| util::hex(rv))
+            .map(util::hex)
             .ok_or_else(|| format!("Register {} has no reset value", register.name))?;
 
         w_impl_items.push(quote! {
@@ -494,7 +494,7 @@ pub fn fields(
                         let pc = &v.pc;
                         let sc = &v.sc;
 
-                        let is_variant = if sc.as_ref().starts_with("_") {
+                        let is_variant = if sc.as_ref().starts_with('_') {
                             Ident::new(&*format!("is{}", sc))
                         } else {
                             Ident::new(&*format!("is_{}", sc))
@@ -981,14 +981,14 @@ fn lookup_in_register<'r>(
             base_evs, register.name
         ))?,
         Some(&(evs, field)) => if matches.len() == 1 {
-            return Ok((
+            Ok((
                 evs,
                 Some(Base {
                     field: field,
                     register: None,
                     peripheral: None,
                 }),
-            ));
+            ))
         } else {
             let fields = matches
                 .iter()
@@ -1049,7 +1049,7 @@ fn periph_all_registers<'a>(p: &'a Peripheral) -> Vec<&'a Register> {
             Either::Left(ref reg) => {
                 par.push(reg);
             }
-            Either::Right(ref cluster) => for ref c in cluster.children.iter() {
+            Either::Right(ref cluster) => for c in cluster.children.iter() {
                 rem.push(c);
             },
         }

src/util.rs

@@ -12,7 +12,7 @@ pub const BITS_PER_BYTE: u32 = 8;
 
 /// List of chars that some vendors use in their peripheral/field names but
 /// that are not valid in Rust ident
-const BLACKLIST_CHARS: &'static [char] = &['(', ')', '[', ']', '/', ' '];
+const BLACKLIST_CHARS : &[char] = &['(', ')', '[', ']', '/', ' '];
 
 pub trait ToSanitizedPascalCase {
     fn to_sanitized_pascal_case(&self) -> Cow<str>;