Merge #609

609: support nested register derive & cleanups r=burrbull a=burrbull



Co-authored-by: Andrey Zgarbul <zgarbul.andrey@gmail.com>

Author: bors[bot]

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- Support "nested" `deriveFrom` for registers located in one peripheral
 - Use modifiedWriteValues for 1-bitwise fields if present
 - Use generic `FieldWriter`, `FieldReader`, `BitWriter`, `BitReader`
 - Disable two clippy warnings in `array_proxy.rs`

Cargo.toml

@@ -49,8 +49,8 @@ serde_json = "1.0.79"
 serde_yaml = "0.8.23"
 
 [dependencies.svd-parser]
-features = ["derive-from"]
-version = "0.13.2"
+features = ["expand"]
+version = "0.13.3"
 
 [dependencies.svd-rs]
 features = ["serde"]

ci/script.sh

@@ -491,7 +491,7 @@ main() {
             echo 'version = "0.3.0"' >> $td/Cargo.toml
 
             # Test MSP430
-            #test_svd_for_target msp430 https://raw.githubusercontent.com/pftbest/msp430g2553/v0.3.0-svd/msp430g2553.svd
+            test_svd_for_target msp430 https://raw.githubusercontent.com/pftbest/msp430g2553/v0.3.0-svd/msp430g2553.svd
         ;;
 
         # Community-provided RISC-V SVDs

src/generate/device.rs

@@ -213,7 +213,7 @@ pub fn render(d: &Device, config: &Config, device_x: &mut String) -> Result<Toke
         }
 
         debug!("Rendering peripheral {}", p.name);
-        match peripheral::render(p, &d.peripherals, &d.default_register_properties, config) {
+        match peripheral::render(p, &d.peripherals, config) {
             Ok(periph) => out.extend(periph),
             Err(e) => {
                 let descrip = p.description.as_deref().unwrap_or("No description");