box register/cluster

Author: burrbull

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(())
 }
@@ -462,7 +462,7 @@ fn expand_register_array(
 
     match r {
         Register::Single(_) => {
-            regs.push(RegisterCluster::Register(r));
+            regs.push(r.into());
         }
         Register::Array(info, dim) => {
             for rx in names(&info, &dim)
@@ -474,7 +474,7 @@ fn expand_register_array(
                     Register::Single(info)
                 })
             {
-                regs.push(RegisterCluster::Register(rx));
+                regs.push(rx.into());
             }
         }
     }

svd-parser/src/registercluster.rs

@@ -9,8 +9,8 @@ impl Parse for RegisterCluster {
 
     fn parse(tree: &Node, config: &Self::Config) -> Result<Self, Self::Error> {
         match tree.tag_name().name() {
-            "register" => Register::parse(tree, config).map(RegisterCluster::Register),
-            "cluster" => Cluster::parse(tree, config).map(RegisterCluster::Cluster),
+            "register" => Register::parse(tree, config).map(Into::into),
+            "cluster" => Cluster::parse(tree, config).map(Into::into),
             _ => Err(
                 SVDError::InvalidRegisterCluster(tree.tag_name().name().to_string()).at(tree.id()),
             ),

svd-rs/src/registercluster.rs

@@ -10,20 +10,20 @@ 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 {
-        RegisterCluster::Register(reg)
+        RegisterCluster::Register(Box::new(reg))
     }
 }
 
 impl From<Cluster> for RegisterCluster {
     fn from(cluser: Cluster) -> Self {
-        RegisterCluster::Cluster(cluser)
+        RegisterCluster::Cluster(Box::new(cluser))
     }
 }