interrupt build none

Author: burrbull

svd-parser/src/peripheral.rs

@@ -38,7 +38,7 @@ impl Parse for Peripheral {
                     .filter(|t| t.is_element() && t.has_tag_name("interrupt"))
                     .map(|i| Interrupt::parse(&i, config))
                     .collect();
-                interrupt?
+                Some(interrupt?)
             })
             .registers(if let Some(registers) = tree.get_child("registers") {
                 let rs: Result<Vec<_>, _> = registers

svd-rs/src/bitrange.rs

@@ -60,7 +60,7 @@ impl BitRange {
             range_type: BitRangeType::MsbLsb,
         }
     }
-    /// Construct a [`BitRange`] from string in the format `[<msb>:<lsb>]`
+    /// Construct a [`BitRange`] from a string in the format `[<msb>:<lsb>]`
     pub fn from_bit_range(text: &str) -> Option<Self> {
         if !text.starts_with('[') || !text.ends_with(']') {
             return None;

svd-rs/src/clusterinfo.rs

@@ -6,7 +6,7 @@ use super::{
 /// Errors from [`ClusterInfo::validate`]
 #[derive(Clone, Debug, PartialEq, Eq, thiserror::Error)]
 pub enum Error {
-    /// The cluster is can not be empty
+    /// The cluster can not be empty
     #[error("Cluster must contain at least one Register or Cluster")]
     EmptyCluster,
 }

svd-rs/src/peripheral.rs

@@ -99,7 +99,7 @@ pub struct PeripheralBuilder {
     base_address: Option<u64>,
     default_register_properties: RegisterProperties,
     address_block: Option<Vec<AddressBlock>>,
-    interrupt: Vec<Interrupt>,
+    interrupt: Option<Vec<Interrupt>>,
     registers: Option<Vec<RegisterCluster>>,
     derived_from: Option<String>,
 }
@@ -115,7 +115,7 @@ impl From<Peripheral> for PeripheralBuilder {
             base_address: Some(p.base_address),
             default_register_properties: p.default_register_properties,
             address_block: p.address_block,
-            interrupt: p.interrupt,
+            interrupt: Some(p.interrupt),
             registers: p.registers,
             derived_from: p.derived_from,
         }
@@ -164,7 +164,7 @@ impl PeripheralBuilder {
         self
     }
     /// Set the interrupts of the peripheral
-    pub fn interrupt(mut self, value: Vec<Interrupt>) -> Self {
+    pub fn interrupt(mut self, value: Option<Vec<Interrupt>>) -> Self {
         self.interrupt = value;
         self
     }
@@ -193,7 +193,7 @@ impl PeripheralBuilder {
                 .ok_or_else(|| BuildError::Uninitialized("base_address".to_string()))?,
             default_register_properties: self.default_register_properties.build(lvl)?,
             address_block: self.address_block,
-            interrupt: self.interrupt,
+            interrupt: self.interrupt.unwrap_or_default(),
             registers: self.registers,
             derived_from: self.derived_from,
         };
@@ -233,8 +233,8 @@ impl Peripheral {
         if let Some(base_address) = builder.base_address {
             self.base_address = base_address;
         }
-        if !builder.interrupt.is_empty() {
-            self.interrupt = builder.interrupt;
+        if let Some(interrupt) = builder.interrupt {
+            self.interrupt = interrupt;
         }
         if builder.derived_from.is_some() {
             self.derived_from = builder.derived_from;