fix tests & clippy

Author: burrbull

svd-parser/src/cpu.rs

@@ -20,6 +20,6 @@ impl Parse for Cpu {
             .nvic_priority_bits(tree.get_child_u32("nvicPrioBits")?)
             .has_vendor_systick(tree.get_child_bool("vendorSystickConfig")?)
             .build(config.validate_level)
-            .map_err(|e| SVDError::from(e).at(tree.id()).into())
+            .map_err(|e| SVDError::from(e).at(tree.id()))
     }
 }

svd-parser/src/elementext.rs

@@ -69,7 +69,7 @@ impl<'a, 'input> ElementExt for Node<'a, 'input> {
     {
         let k = k.as_ref();
         self.get_child_text_opt(k)?
-            .ok_or_else(|| SVDError::MissingTag(format!("{}", k)).at(self.id()))
+            .ok_or_else(|| SVDError::MissingTag(k.to_string()).at(self.id()))
     }
 
     /// Get text contained by an XML Element

svd-parser/src/lib.rs

@@ -82,8 +82,7 @@ pub fn parse(xml: &str) -> anyhow::Result<Device> {
 pub fn parse_with_config(xml: &str, config: &Config) -> anyhow::Result<Device> {
     fn get_name<'a>(node: &'a Node) -> Option<&'a str> {
         node.children()
-            .filter(|t| t.has_tag_name("name"))
-            .next()
+            .find(|t| t.has_tag_name("name"))
             .and_then(|t| t.text())
     }
 
@@ -103,12 +102,10 @@ pub fn parse_with_config(xml: &str, config: &Config) -> anyhow::Result<Device> {
             let mut res = Err(e.into());
             if tagname.is_empty() {
                 res = res.with_context(|| format!("at {}", pos))
+            } else if let Some(name) = get_name(&node) {
+                res = res.with_context(|| format!("Parsing {} `{}` at {}", tagname, name, pos))
             } else {
-                if let Some(name) = get_name(&node) {
-                    res = res.with_context(|| format!("Parsing {} `{}` at {}", tagname, name, pos))
-                } else {
-                    res = res.with_context(|| format!("Parsing unknown {} at {}", tagname, pos))
-                }
+                res = res.with_context(|| format!("Parsing unknown {} at {}", tagname, pos))
             }
             for parent in node.ancestors().skip(1) {
                 if parent.id() == NodeId::new(0) {

svd-rs/Cargo.toml

@@ -31,6 +31,7 @@ optional = true
 
 [dev-dependencies]
 serde_json = "1.0"
+svd-parser = { version = "0.10.2", path = "../svd-parser"}
 
 [[example]]
 name = "svd2json"

tests/Cargo.toml

@@ -11,5 +11,5 @@ svd-rs = { version = "0.10.2", path = "../svd-rs"}
 svd-parser = { version = "0.10.2", path = "../svd-parser"}
 svd-encoder = { version = "0.10.2", path = "../svd-encoder"}
 roxmltree = "0.14.1"
-xmltree = "0.8"
+xmltree = "0.10.3"
 anyhow = "1.0.19"

tests/src/addressblock.rs

@@ -1,13 +1,13 @@
 use super::run_test;
-use crate::svd::AddressBlock;
+use crate::svd::{AddressBlock, AddressBlockUsage};
 
 #[test]
 fn decode_encode() {
     let tests = vec![(
         AddressBlock {
             offset: 0,
             size: 0x00000800,
-            usage: String::from("registers"),
+            usage: AddressBlockUsage::Registers,
         },
         "<addressBlock>
             <offset>0x0</offset>

tests/src/bitrange.rs

@@ -1,4 +1,3 @@
-use crate::new_element;
 use crate::parse::Parse;
 use crate::svd::{BitRange, BitRangeType};
 use xmltree::Element;
@@ -48,7 +47,7 @@ fn decode_encode() {
         let tree1 = Element::parse(s.as_bytes()).unwrap();
         let value = BitRange::parse(&tree1).unwrap();
         assert_eq!(value, a, "Parsing `{}` expected `{:?}`", s, a);
-        let mut tree2 = new_element("fake", None);
+        let mut tree2 = Element::new("fake");
         tree2.children = value.encode().unwrap();
         assert_eq!(tree1, tree2, "Encoding {:?} expected {}", a, s);
     }

tests/src/cpu.rs

@@ -1,5 +1,5 @@
 use super::run_test;
-use crate::svd::{Cpu, Endian};
+use crate::svd::{Cpu, Endian, ValidateLevel};
 
 #[test]
 fn decode_encode() {
@@ -12,7 +12,7 @@ fn decode_encode() {
             .fpu_present(true)
             .nvic_priority_bits(8)
             .has_vendor_systick(false)
-            .build()
+            .build(ValidateLevel::Strict)
             .unwrap(),
         "
                 <cpu>

tests/src/dimelement.rs

@@ -1,5 +1,5 @@
 use super::run_test;
-use crate::svd::DimElement;
+use crate::svd::{DimElement, ValidateLevel};
 
 #[test]
 fn decode_encode() {
@@ -8,7 +8,7 @@ fn decode_encode() {
             .dim(100)
             .dim_increment(4)
             .dim_index(Some(vec!["10".to_string(), "20".to_string()]))
-            .build()
+            .build(ValidateLevel::Strict)
             .unwrap(),
         "<dimElement>
             <dim>100</dim>

tests/src/enumeratedvalue.rs

@@ -1,5 +1,5 @@
 use super::run_test;
-use crate::svd::EnumeratedValue;
+use crate::svd::{EnumeratedValue, ValidateLevel};
 
 #[test]
 fn decode_encode() {
@@ -10,7 +10,7 @@ fn decode_encode() {
                 "Zero wait-states inserted in fetch or read transfers".to_string(),
             ))
             .value(Some(0))
-            .build()
+            .build(ValidateLevel::Strict)
             .unwrap(),
         "
             <enumeratedValue>