box register/cluster

rust-embedded · Nov 18, 2023 · 982895f · 982895f
1 parent 4894fdf
commit 982895f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/svd-parser/src/expand.rs b/svd-parser/src/expand.rs
@@ -293,8 +293,8 @@ fn expand_register_cluster(
     index: &Index,
 ) -> Result<()> {
     match rc {
-        RegisterCluster::Cluster(c) => expand_cluster_array(regs, c, path, index)?,
-        RegisterCluster::Register(r) => expand_register_array(regs, r, path, index)?,
+        RegisterCluster::Cluster(c) => expand_cluster_array(regs, *c, path, index)?,
+        RegisterCluster::Register(r) => expand_register_array(regs, *r, path, index)?,
     }
     Ok(())
 }

diff --git a/svd-rs/src/registercluster.rs b/svd-rs/src/registercluster.rs
@@ -10,19 +10,31 @@ use super::{Cluster, Register};
 #[allow(clippy::large_enum_variant)]
 pub enum RegisterCluster {
     /// Register
-    Register(Register),
+    Register(Box<Register>),
     /// Cluster
-    Cluster(Cluster),
+    Cluster(Box<Cluster>),
 }
 
 impl From<Register> for RegisterCluster {
     fn from(reg: Register) -> Self {
-        Self::Register(reg)
+        Self::Register(Box::new(reg))
     }
 }
 
 impl From<Cluster> for RegisterCluster {
     fn from(cluser: Cluster) -> Self {
+        Self::Cluster(Box::new(cluser))
+    }
+}
+
+impl From<Box<Register>> for RegisterCluster {
+    fn from(reg: Box<Register>) -> Self {
+        Self::Register(reg)
+    }
+}
+
+impl From<Box<Cluster>> for RegisterCluster {
+    fn from(cluser: Box<Cluster>) -> Self {
         Self::Cluster(cluser)
     }
 }