Do not derive DimElement

svd-rs/CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+- Do not derive `DimElement`
 - Revert the `riscv` elements, as well as the `unstable-riscv` feature.
 
 ## [v0.14.9] - 2024-08-20
@@ -143,4 +144,3 @@ Previous versions in common [changelog](../CHANGELOG.md).
 [v0.11.2]: https://github.com/rust-embedded/svd/compare/svd-rs-v0.11.1...svd-rs-v0.11.2
 [v0.11.1]: https://github.com/rust-embedded/svd/compare/v0.11.0...svd-rs-v0.11.1
 [v0.11.0]: https://github.com/rust-embedded/svd/compare/v0.10.2...v0.11.0
-

svd-rs/src/derive_from.rs

@@ -112,19 +112,10 @@ where
     T: DeriveFrom,
 {
     fn derive_from(&self, other: &Self) -> Self {
-        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)) => {
-                let mut dim = other_dim.clone();
-                dim.dim_name = None;
-                Self::Array(info.derive_from(other_info), dim)
-            }
-            (Self::Array(info, dim), Self::Single(other_info))
-            | (Self::Array(info, dim), Self::Array(other_info, _)) => {
-                Self::Array(info.derive_from(other_info), dim.clone())
-            }
+        let info = (*self).derive_from(*other);
+        match self {
+            Self::Single(_) => Self::Single(info),
+            Self::Array(_, dim) => Self::Array(info, dim),
         }
     }
 }