Merge #589

589: fix 579: cluster name r=Emilgardis a=burrbull



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

Author: bors[bot]

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.22.1] - 2022-04-05
+
+- Fix #579
+
 ## [v0.22.0] - 2022-04-05
 
 ### Added
@@ -673,7 +677,8 @@ peripheral.register.write(|w| w.field().set());
 
 - Initial version of the `svd2rust` tool
 
-[Unreleased]: https://github.com/rust-embedded/svd2rust/compare/v0.22.0...HEAD
+[Unreleased]: https://github.com/rust-embedded/svd2rust/compare/v0.22.1...HEAD
+[v0.22.1]: https://github.com/rust-embedded/svd2rust/compare/v0.22.0...v0.22.1
 [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

Cargo.toml

@@ -23,7 +23,7 @@ keywords = [
 license = "MIT OR Apache-2.0"
 name = "svd2rust"
 repository = "https://github.com/rust-embedded/svd2rust/"
-version = "0.22.0"
+version = "0.22.1"
 readme = "README.md"
 
 [package.metadata.deb]

src/generate/peripheral.rs

@@ -745,7 +745,7 @@ fn expand_cluster(
                 } else {
                     let mut accessors = TokenStream::new();
                     let nb_name = util::replace_suffix(&info.name, "");
-                    let ty = name_to_wrapped_ty(&nb_name, name)?;
+                    let ty = name_to_ty(&nb_name, name)?;
                     let nb_name_cs =
                         Ident::new(&nb_name.to_sanitized_snake_case(), Span::call_site());
                     let description = info.description.as_ref().unwrap_or(&info.name);