Merge branch 'master' into optional-register-desc

Author: ryankurte

src/lib.rs

@@ -26,7 +26,6 @@
 
 extern crate either;
 extern crate xmltree;
-#[macro_use]
 extern crate failure;
 
 #[cfg(feature = "unproven")]

src/svd/registerinfo.rs

@@ -59,8 +59,8 @@ impl RegisterInfo {
             name,
             alternate_group: tree.get_child_text_opt("alternateGroup")?,
             alternate_register: tree.get_child_text_opt("alternateRegister")?,
-            derived_from: tree.get_child_text_opt("derivedFrom")?,
             description: tree.get_child_text_opt("description")?,
+            derived_from: tree.attributes.get("derivedFrom").map(|s| s.to_owned()),
             address_offset: tree.get_child_u32("addressOffset")?,
             size: parse::optional::<u32>("size", tree)?,
             access: parse::optional::<Access>("access", tree)?,
@@ -143,10 +143,8 @@ impl Encode for RegisterInfo {
 
         match self.derived_from {
             Some(ref v) => {
-                elem.children.push(new_element(
-                    "derivedFrom",
-                    Some(format!("{}", v)),
-                ));
+                elem.attributes
+                    .insert(String::from("derivedFrom"), format!("{}", v));
             }
             None => (),
         }
@@ -261,13 +259,12 @@ mod tests {
                 _extensible: (),
             },
             "
-            <register>
+            <register derivedFrom=\"derived from\">
                 <name>WRITECTRL</name>
                 <description>Write Control Register</description>
                 <addressOffset>0x8</addressOffset>
                 <alternateGroup>alternate group</alternateGroup>
                 <alternateRegister>alternate register</alternateRegister>
-                <derivedFrom>derived from</derivedFrom>
                 <size>32</size>
                 <access>read-write</access>
                 <resetValue>0x00000000</resetValue>