Merge #145

145: implement From for Builders r=Emilgardis a=burrbull



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

Author: bors[bot]

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- Added implementations of `From<Type>` for `TypeBuilder`'s
+
 ## [v0.10.1] - 2021-04-17
 
 - Added `DeriveFrom` implementation for `FieldInfo`

src/svd/clusterinfo.rs

@@ -52,6 +52,20 @@ pub struct ClusterInfoBuilder {
     children: Option<Vec<RegisterCluster>>,
 }
 
+impl From<ClusterInfo> for ClusterInfoBuilder {
+    fn from(c: ClusterInfo) -> Self {
+        Self {
+            name: Some(c.name),
+            address_offset: Some(c.address_offset),
+            derived_from: c.derived_from,
+            description: c.description,
+            header_struct_name: c.header_struct_name,
+            default_register_properties: c.default_register_properties,
+            children: Some(c.children),
+        }
+    }
+}
+
 impl ClusterInfoBuilder {
     pub fn name(mut self, value: String) -> Self {
         self.name = Some(value);

src/svd/cpu.rs

@@ -46,6 +46,20 @@ pub struct CpuBuilder {
     has_vendor_systick: Option<bool>,
 }
 
+impl From<Cpu> for CpuBuilder {
+    fn from(c: Cpu) -> Self {
+        Self {
+            name: Some(c.name),
+            revision: Some(c.revision),
+            endian: Some(c.endian),
+            mpu_present: Some(c.mpu_present),
+            fpu_present: Some(c.fpu_present),
+            nvic_priority_bits: Some(c.nvic_priority_bits),
+            has_vendor_systick: Some(c.has_vendor_systick),
+        }
+    }
+}
+
 impl CpuBuilder {
     pub fn name(mut self, value: String) -> Self {
         self.name = Some(value);

src/svd/device.rs

@@ -69,6 +69,22 @@ pub struct DeviceBuilder {
     default_register_properties: RegisterProperties,
 }
 
+impl From<Device> for DeviceBuilder {
+    fn from(d: Device) -> Self {
+        Self {
+            name: Some(d.name),
+            schema_version: d.schema_version,
+            version: d.version,
+            description: d.description,
+            address_unit_bits: d.address_unit_bits,
+            width: d.width,
+            cpu: d.cpu,
+            peripherals: Some(d.peripherals),
+            default_register_properties: d.default_register_properties,
+        }
+    }
+}
+
 impl DeviceBuilder {
     pub fn name(mut self, value: String) -> Self {
         self.name = Some(value);

src/svd/dimelement.rs

@@ -32,6 +32,16 @@ pub struct DimElementBuilder {
     dim_index: Option<Vec<String>>,
 }
 
+impl From<DimElement> for DimElementBuilder {
+    fn from(d: DimElement) -> Self {
+        Self {
+            dim: Some(d.dim),
+            dim_increment: Some(d.dim_increment),
+            dim_index: d.dim_index,
+        }
+    }
+}
+
 impl DimElementBuilder {
     pub fn dim(mut self, value: u32) -> Self {
         self.dim = Some(value);

src/svd/enumeratedvalue.rs

@@ -48,6 +48,17 @@ pub struct EnumeratedValueBuilder {
     is_default: Option<bool>,
 }
 
+impl From<EnumeratedValue> for EnumeratedValueBuilder {
+    fn from(e: EnumeratedValue) -> Self {
+        Self {
+            name: Some(e.name),
+            description: e.description,
+            value: e.value,
+            is_default: e.is_default,
+        }
+    }
+}
+
 impl EnumeratedValueBuilder {
     pub fn name(mut self, value: String) -> Self {
         self.name = Some(value);

src/svd/enumeratedvalues.rs

@@ -47,6 +47,17 @@ pub struct EnumeratedValuesBuilder {
     values: Option<Vec<EnumeratedValue>>,
 }
 
+impl From<EnumeratedValues> for EnumeratedValuesBuilder {
+    fn from(e: EnumeratedValues) -> Self {
+        Self {
+            name: e.name,
+            usage: e.usage,
+            derived_from: e.derived_from,
+            values: Some(e.values),
+        }
+    }
+}
+
 impl EnumeratedValuesBuilder {
     pub fn name(mut self, value: Option<String>) -> Self {
         self.name = value;

src/svd/fieldinfo.rs

@@ -67,6 +67,21 @@ pub struct FieldInfoBuilder {
     modified_write_values: Option<ModifiedWriteValues>,
 }
 
+impl From<FieldInfo> for FieldInfoBuilder {
+    fn from(f: FieldInfo) -> Self {
+        Self {
+            name: Some(f.name),
+            bit_range: Some(f.bit_range),
+            derived_from: f.derived_from,
+            description: f.description,
+            access: f.access,
+            enumerated_values: Some(f.enumerated_values),
+            write_constraint: f.write_constraint,
+            modified_write_values: f.modified_write_values,
+        }
+    }
+}
+
 impl FieldInfoBuilder {
     pub fn name(mut self, value: String) -> Self {
         self.name = Some(value);

src/svd/peripheral.rs

@@ -83,6 +83,24 @@ pub struct PeripheralBuilder {
     derived_from: Option<String>,
 }
 
+impl From<Peripheral> for PeripheralBuilder {
+    fn from(p: Peripheral) -> Self {
+        Self {
+            name: Some(p.name),
+            base_address: Some(p.base_address),
+            version: p.version,
+            display_name: p.display_name,
+            group_name: p.group_name,
+            description: p.description,
+            address_block: p.address_block,
+            interrupt: p.interrupt,
+            default_register_properties: p.default_register_properties,
+            registers: p.registers,
+            derived_from: p.derived_from,
+        }
+    }
+}
+
 impl PeripheralBuilder {
     pub fn name(mut self, value: String) -> Self {
         self.name = Some(value);

src/svd/registerinfo.rs

@@ -93,6 +93,28 @@ pub struct RegisterInfoBuilder {
     modified_write_values: Option<ModifiedWriteValues>,
 }
 
+impl From<RegisterInfo> for RegisterInfoBuilder {
+    fn from(r: RegisterInfo) -> Self {
+        Self {
+            name: Some(r.name),
+            address_offset: Some(r.address_offset),
+            alternate_group: r.alternate_group,
+            alternate_register: r.alternate_register,
+            derived_from: r.derived_from,
+            description: r.description,
+            properties: RegisterProperties {
+                size: r.size,
+                access: r.access,
+                reset_value: r.reset_value,
+                reset_mask: r.reset_mask,
+            },
+            fields: r.fields,
+            write_constraint: r.write_constraint,
+            modified_write_values: r.modified_write_values,
+        }
+    }
+}
+
 impl RegisterInfoBuilder {
     pub fn name(mut self, value: String) -> Self {
         self.name = Some(value);