Merge pull request #286 from rust-embedded/derive-revert

Partially revert #283
rust-embedded · Feb 10, 2025 · 129cb42 · 129cb42
2 parents 4075e69 + bb0bd88
commit 129cb42
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/svd-rs/CHANGELOG.md b/svd-rs/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- Partially revert #283
+
 ## [v0.14.10] - 2025-02-08
 
 - Do not derive `DimElement`

diff --git a/svd-rs/src/derive_from.rs b/svd-rs/src/derive_from.rs
@@ -109,14 +109,25 @@ impl DeriveFrom for FieldInfo {
 
 impl<T> DeriveFrom for MaybeArray<T>
 where
-    T: DeriveFrom,
+    T: DeriveFrom + crate::Name,
 {
     fn derive_from(&self, other: &Self) -> Self {
-        use std::ops::Deref;
-        let info = self.deref().derive_from(other.deref());
-        match self {
-            Self::Single(_) => Self::Single(info),
-            Self::Array(_, dim) => Self::Array(info, dim.clone()),
+        match (self, other) {
+            (Self::Single(info), Self::Single(other_info)) => {
+                Self::Single(info.derive_from(other_info))
+            }
+            (Self::Single(info), Self::Array(other_info, other_dim)) => {
+                if info.name().contains("%s") {
+                    let mut dim = other_dim.clone();
+                    dim.dim_name = None;
+                    Self::Array(info.derive_from(other_info), dim)
+                } else {
+                    Self::Single(info.derive_from(other_info))
+                }
+            }
+            (Self::Array(info, dim), Self::Single(other_info) | Self::Array(other_info, _)) => {
+                Self::Array(info.derive_from(other_info), dim.clone())
+            }
         }
     }
 }