Merge #588

588: v0.22 r=Emilgardis a=burrbull



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

Author: bors[bot]

CHANGELOG.md

@@ -7,9 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.22.0] - 2022-04-05
+
 ### Added
 
 - added `dyn` keyword to sanatizer.
+
 ### Changed
 
 - Generate Rust arrays for all register & cluster arrays with sequential_addresses.
@@ -670,7 +673,8 @@ peripheral.register.write(|w| w.field().set());
 
 - Initial version of the `svd2rust` tool
 
-[Unreleased]: https://github.com/rust-embedded/svd2rust/compare/v0.21.0...HEAD
+[Unreleased]: https://github.com/rust-embedded/svd2rust/compare/v0.22.0...HEAD
+[v0.22.0]: https://github.com/rust-embedded/svd2rust/compare/v0.21.0...v0.22.0
 [v0.21.0]: https://github.com/rust-embedded/svd2rust/compare/v0.20.0...v0.21.0
 [v0.20.0]: https://github.com/rust-embedded/svd2rust/compare/v0.19.0...v0.20.0
 [v0.19.0]: https://github.com/rust-embedded/svd2rust/compare/v0.18.0...v0.19.0

Cargo.toml

@@ -23,7 +23,7 @@ keywords = [
 license = "MIT OR Apache-2.0"
 name = "svd2rust"
 repository = "https://github.com/rust-embedded/svd2rust/"
-version = "0.21.0"
+version = "0.22.0"
 readme = "README.md"
 
 [package.metadata.deb]
@@ -54,7 +54,7 @@ version = "0.13.1"
 
 [dependencies.svd-rs]
 features = ["serde"]
-version = "0.13.0"
+version = "0.13.1"
 
 [dependencies.syn]
 version = "1.0"

src/generate/register.rs

@@ -318,7 +318,7 @@ pub fn fields(
         let can_write = can_write && (f.access != Some(Access::ReadOnly));
 
         let mask = u64::MAX >> (64 - width);
-        let hexmask = &util::hex(mask);
+        let hexmask = &util::digit_or_hex(mask);
         let offset = u64::from(offset);
         let rv = properties.reset_value.map(|rv| (rv >> offset) & mask);
         let fty = width.to_ty()?;
@@ -348,7 +348,7 @@ pub fn fields(
 
         let field_dim = match f {
             Field::Array(_, de) => {
-                let (first, index) = if let Some(dim_index) = &de.dim_index {
+                let first = if let Some(dim_index) = &de.dim_index {
                     if let Ok(first) = dim_index[0].parse::<u32>() {
                         let sequential_indexes = dim_index
                             .iter()
@@ -357,17 +357,14 @@ pub fn fields(
                         if !sequential_indexes {
                             return Err(anyhow!("unsupported array indexes in {}", f.name));
                         }
-                        (first, None)
+                        first
                     } else {
-                        (0, de.dim_index.clone())
+                        0
                     }
                 } else {
-                    (0, None)
-                };
-                let suffixes: Vec<_> = match index {
-                    Some(ix) => ix,
-                    None => (0..de.dim).map(|i| (first + i).to_string()).collect(),
+                    0
                 };
+                let suffixes: Vec<_> = de.indexes().collect();
                 let suffixes_str = format!("({}-{})", first, first + de.dim - 1);
                 Some((first, de.dim, de.dim_increment, suffixes, suffixes_str))
             }

src/util.rs

@@ -260,6 +260,14 @@ pub fn access_of(properties: &RegisterProperties, fields: Option<&[Field]>) -> A
     })
 }
 
+pub fn digit_or_hex(n: u64) -> TokenStream {
+    if n < 10 {
+        unsuffixed(n)
+    } else {
+        hex(n)
+    }
+}
+
 /// Turns `n` into an unsuffixed separated hex token
 pub fn hex(n: u64) -> TokenStream {
     let (h4, h3, h2, h1) = (