Skip to content

box register/cluster #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

box register/cluster #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions svd-parser/src/expand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
}
Expand Down
18 changes: 15 additions & 3 deletions svd-rs/src/registercluster.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down