impl DeriveFrom for Register/Cluster/Field

Author: burrbull

svd-rs/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+
+- Implement `DeriveFrom` for `Cluster`, `Register` and `Field`
+
 ## [v0.11.1] - 2021-10-02
 
 - Reexport builders

svd-rs/src/derive_from.rs

@@ -1,6 +1,7 @@
 //! Implementations of DeriveFrom, setting non-explicit fields.
 use crate::{
-    ClusterInfo, EnumeratedValues, FieldInfo, Peripheral, RegisterInfo, RegisterProperties,
+    Cluster, ClusterInfo, EnumeratedValues, Field, FieldInfo, Peripheral, Register, RegisterInfo,
+    RegisterProperties,
 };
 
 /// Fill empty fields of structure with values of other structure
@@ -53,7 +54,7 @@ impl DeriveFrom for Peripheral {
 }
 
 impl DeriveFrom for RegisterInfo {
-    fn derive_from(&self, other: &RegisterInfo) -> RegisterInfo {
+    fn derive_from(&self, other: &Self) -> Self {
         let mut derived = self.clone();
         derived.description = derived.description.or_else(|| other.description.clone());
         derived.properties = derived.properties.derive_from(&other.properties);
@@ -92,3 +93,54 @@ impl DeriveFrom for FieldInfo {
         derived
     }
 }
+
+impl DeriveFrom for Cluster {
+    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)) => {
+                Self::Array(info.derive_from(other_info), other_dim.clone())
+            }
+            (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())
+            }
+        }
+    }
+}
+
+impl DeriveFrom for Register {
+    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)) => {
+                Self::Array(info.derive_from(other_info), other_dim.clone())
+            }
+            (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())
+            }
+        }
+    }
+}
+
+impl DeriveFrom for Field {
+    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)) => {
+                Self::Array(info.derive_from(other_info), other_dim.clone())
+            }
+            (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())
+            }
+        }
+    }
+}