Merge #143

143: add missed DeriveFrom implementation r=therealprof a=burrbull

r? @therealprof 

Co-authored-by: Andrey Zgarbul <[email protected]>

Author: bors[bot]

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.10.1] - 2021-04-17
+
+- Added `DeriveFrom` implementation for `FieldInfo`
+
 ## [v0.10.0] - 2021-04-04
 
 - Added `strict` feature that hides part of checks
@@ -129,7 +133,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Initial SVD parser
 - A `parse` utility function to parse the contents of a SVD file (XML)
 
-[Unreleased]: https://github.com/rust-embedded/svd/compare/v0.10.0...HEAD
+[Unreleased]: https://github.com/rust-embedded/svd/compare/v0.10.1...HEAD
+[v0.10.1]: https://github.com/rust-embedded/svd/compare/v0.10.0...v0.10.1
 [v0.10.0]: https://github.com/rust-embedded/svd/compare/v0.9.0...v0.10.0
 [v0.9.0]: https://github.com/rust-embedded/svd/compare/v0.8.1...v0.9.0
 [v0.8.1]: https://github.com/rust-embedded/svd/compare/v0.8.0...v0.8.1

Cargo.toml

@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
 name = "svd-parser"
 repository = "https://github.com/rust-embedded/svd"
 edition = "2018"
-version = "0.10.0"
+version = "0.10.1"
 readme = "README.md"
 
 [features]

src/derive_from.rs

@@ -1,4 +1,6 @@
-use crate::{ClusterInfo, EnumeratedValues, Peripheral, RegisterInfo, RegisterProperties};
+use crate::{
+    ClusterInfo, EnumeratedValues, FieldInfo, Peripheral, RegisterInfo, RegisterProperties,
+};
 
 /// Fill empty fields of structure with values of other structure
 pub trait DeriveFrom {
@@ -14,7 +16,7 @@ impl DeriveFrom for ClusterInfo {
             .derive_from(&other.default_register_properties);
         derived.header_struct_name = derived
             .header_struct_name
-            .or(other.header_struct_name.clone());
+            .or_else(|| other.header_struct_name.clone());
         if derived.children.is_empty() {
             derived.children = other.children.clone();
         }
@@ -25,7 +27,7 @@ impl DeriveFrom for ClusterInfo {
 impl DeriveFrom for EnumeratedValues {
     fn derive_from(&self, other: &Self) -> Self {
         let mut derived = self.clone();
-        derived.usage = derived.usage.or(other.usage.clone());
+        derived.usage = derived.usage.or_else(|| other.usage.clone());
         if derived.values.is_empty() {
             derived.values = other.values.clone();
         }
@@ -36,12 +38,12 @@ impl DeriveFrom for EnumeratedValues {
 impl DeriveFrom for Peripheral {
     fn derive_from(&self, other: &Self) -> Self {
         let mut derived = self.clone();
-        derived.group_name = derived.group_name.or(other.group_name.clone());
-        derived.description = derived.description.or(other.description.clone());
+        derived.group_name = derived.group_name.or_else(|| other.group_name.clone());
+        derived.description = derived.description.or_else(|| other.description.clone());
         derived.default_register_properties = derived
             .default_register_properties
             .derive_from(&other.default_register_properties);
-        derived.registers = derived.registers.or(other.registers.clone());
+        derived.registers = derived.registers.or_else(|| other.registers.clone());
         if derived.interrupt.is_empty() {
             derived.interrupt = other.interrupt.clone();
         }
@@ -52,12 +54,12 @@ impl DeriveFrom for Peripheral {
 impl DeriveFrom for RegisterInfo {
     fn derive_from(&self, other: &RegisterInfo) -> RegisterInfo {
         let mut derived = self.clone();
-        derived.description = derived.description.or(other.description.clone());
+        derived.description = derived.description.or_else(|| other.description.clone());
         derived.size = derived.size.or(other.size);
         derived.access = derived.access.or(other.access);
         derived.reset_value = derived.reset_value.or(other.reset_value);
         derived.reset_mask = derived.reset_mask.or(other.reset_mask);
-        derived.fields = derived.fields.or(other.fields.clone());
+        derived.fields = derived.fields.or_else(|| other.fields.clone());
         derived.write_constraint = derived.write_constraint.or(other.write_constraint);
         derived.modified_write_values = derived
             .modified_write_values
@@ -76,3 +78,19 @@ impl DeriveFrom for RegisterProperties {
         derived
     }
 }
+
+impl DeriveFrom for FieldInfo {
+    fn derive_from(&self, other: &Self) -> Self {
+        let mut derived = self.clone();
+        derived.description = derived.description.or_else(|| other.description.clone());
+        derived.access = derived.access.or(other.access);
+        if derived.enumerated_values.is_empty() {
+            derived.enumerated_values = other.enumerated_values.clone();
+        }
+        derived.write_constraint = derived.write_constraint.or(other.write_constraint);
+        derived.modified_write_values = derived
+            .modified_write_values
+            .or(other.modified_write_values);
+        derived
+    }
+}