Merge #136

136: Fix clippy for MSRV 1.36 r=Emilgardis a=brainstorm

Fixes #135

Co-authored-by: Roman Valls Guimera <[email protected]>

Author: bors[bot]

.github/workflows/clippy.yml

@@ -15,7 +15,6 @@ jobs:
           toolchain: 1.36.0
           override: true
           components: clippy
-      # TODO enable this once clippy warnings are fixed
-      # - uses: actions-rs/clippy-check@v1
-      #   with:
-      #     token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

src/error.rs

@@ -116,7 +116,7 @@ pub(crate) fn check_has_placeholder(name: &str, tag: &str) -> Result<()> {
 }
 
 pub(crate) fn check_derived_name(name: &str, tag: &str) -> Result<()> {
-    for x in name.split(".") {
+    for x in name.split('.') {
         check_dimable_name(x, tag)?
     }
     Ok(())

src/svd/clusterinfo.rs

@@ -110,10 +110,8 @@ impl ClusterInfo {
         check_dimable_name(&self.name, "name")?;
         if let Some(name) = self.derived_from.as_ref() {
             check_derived_name(name, "derivedFrom")?;
-        } else {
-            if self.children.is_empty() {
-                return Err(SVDError::EmptyCluster)?;
-            }
+        } else if self.children.is_empty() {
+            return Err(SVDError::EmptyCluster)?;
         }
         Ok(self)
     }
@@ -159,7 +157,7 @@ impl Encode for ClusterInfo {
 
         if let Some(v) = &self.derived_from {
             e.attributes
-                .insert(String::from("derivedFrom"), format!("{}", v));
+                .insert(String::from("derivedFrom"), v.to_string());
         }
 
         e.children

src/svd/device.rs

@@ -198,7 +198,7 @@ impl Encode for Device {
         );
         if let Some(schema_version) = &self.schema_version {
             elem.attributes
-                .insert(String::from("schemaVersion"), format!("{}", schema_version));
+                .insert(String::from("schemaVersion"), schema_version.to_string());
         }
         if let Some(schema_version) = &self.schema_version {
             elem.attributes.insert(

src/svd/enumeratedvalue.rs

@@ -64,6 +64,7 @@ impl EnumeratedValueBuilder {
         self.value = value;
         self
     }
+    #[allow(clippy::wrong_self_convention)]
     pub fn is_default(mut self, value: Option<bool>) -> Self {
         self.is_default = value;
         self

src/svd/enumeratedvalues.rs

@@ -87,12 +87,10 @@ impl EnumeratedValues {
         if let Some(dname) = self.derived_from.as_ref() {
             check_derived_name(dname, "derivedFrom")?;
             Ok(self)
+        } else if self.values.is_empty() {
+            Err(EnumeratedValuesError::Empty.into())
         } else {
-            if self.values.is_empty() {
-                Err(EnumeratedValuesError::Empty.into())
-            } else {
-                Ok(self)
-            }
+            Ok(self)
         }
     }
     pub(crate) fn check_range(&self, range: core::ops::Range<u64>) -> Result<()> {

src/svd/field.rs

@@ -50,7 +50,6 @@ impl Parse for Field {
     }
 }
 
-
 impl Encode for Field {
     type Error = anyhow::Error;
 

src/svd/fieldinfo.rs

@@ -1,4 +1,3 @@
-
 use std::collections::HashMap;
 
 use crate::elementext::ElementExt;
@@ -208,7 +207,7 @@ impl Encode for FieldInfo {
 
         if let Some(v) = &self.derived_from {
             elem.attributes
-                .insert(String::from("derivedFrom"), format!("{}", v));
+                .insert(String::from("derivedFrom"), v.to_string());
         }
 
         // Add bit range

src/svd/interrupt.rs

@@ -1,4 +1,3 @@
-
 use std::collections::HashMap;
 
 use xmltree::Element;

src/svd/peripheral.rs

@@ -1,4 +1,3 @@
-
 use std::collections::HashMap;
 
 use xmltree::Element;
@@ -237,19 +236,19 @@ impl Encode for Peripheral {
 
         if let Some(v) = &self.version {
             elem.children
-                .push(new_element("version", Some(format!("{}", v))));
+                .push(new_element("version", Some(v.to_string())));
         };
         if let Some(v) = &self.display_name {
             elem.children
-                .push(new_element("displayName", Some(format!("{}", v))));
+                .push(new_element("displayName", Some(v.to_string())));
         };
         if let Some(v) = &self.group_name {
             elem.children
-                .push(new_element("groupName", Some(format!("{}", v))));
+                .push(new_element("groupName", Some(v.to_string())));
         };
         if let Some(v) = &self.description {
             elem.children
-                .push(new_element("description", Some(format!("{}", v))));
+                .push(new_element("description", Some(v.to_string())));
         };
         elem.children.push(new_element(
             "baseAddress",
@@ -283,7 +282,7 @@ impl Encode for Peripheral {
 
         if let Some(v) = &self.derived_from {
             elem.attributes
-                .insert(String::from("derivedFrom"), format!("{}", v));
+                .insert(String::from("derivedFrom"), v.to_string());
         }
 
         Ok(elem)

src/svd/registerinfo.rs

@@ -267,22 +267,21 @@ impl Encode for RegisterInfo {
         }
         if let Some(v) = &self.alternate_group {
             elem.children
-                .push(new_element("alternateGroup", Some(format!("{}", v))));
+                .push(new_element("alternateGroup", Some(v.to_string())));
         }
 
         if let Some(v) = &self.alternate_register {
             elem.children
-                .push(new_element("alternateRegister", Some(format!("{}", v))));
+                .push(new_element("alternateRegister", Some(v.to_string())));
         }
 
         if let Some(v) = &self.derived_from {
             elem.attributes
-                .insert(String::from("derivedFrom"), format!("{}", v));
+                .insert(String::from("derivedFrom"), v.to_string());
         }
 
         if let Some(v) = &self.size {
-            elem.children
-                .push(new_element("size", Some(format!("{}", v))));
+            elem.children.push(new_element("size", Some(v.to_string())));
         };
 
         if let Some(v) = &self.access {

tests/bad_svd.rs

@@ -13,4 +13,4 @@ fn arm_sample_faulty() {
     } else {
         panic!()
     }
-}
+}