fields()

Author: burrbull

src/patch/mod.rs

@@ -251,7 +251,7 @@ fn make_ev_name(name: &str, usage: Option<Usage>) -> Result<String> {
         + match usage.unwrap_or_default() {
             Usage::Read => "R",
             Usage::Write => "W",
-            Usage::ReadWrite => "",
+            Usage::ReadWrite => "_E",
         })
 }
 

src/patch/peripheral.rs

@@ -533,10 +533,8 @@ impl RegisterBlockExt for Peripheral {
             source.address_offset = ptag.address_offset;
             *ptag = source;
         } else {
-            self.registers
-                .as_mut()
-                .unwrap()
-                .push(RegisterCluster::Register(source))
+            let registers = self.registers.get_or_insert_with(|| Vec::new());
+            registers.push(RegisterCluster::Register(source));
         }
         Ok(())
     }

src/patch/register.rs

@@ -656,10 +656,7 @@ impl RegisterExt for Register {
             // This is a derived enumeratedValues => Try to find the
             // original definition to extract its <usage>
             let mut derived_enums = self
-                .fields
-                .as_ref()
-                .unwrap()
-                .iter()
+                .fields()
                 .flat_map(|f| f.enumerated_values.iter())
                 .filter(|e| e.name.as_deref() == Some(d));
             let orig_usage = match (derived_enums.next(), derived_enums.next()) {