Skip to content

Commit 09c2712

Browse files
The field name is used in the enumerated_value name, if the enumerated_value does not have a name.
Because a derived enumerate values in patched svd are written over by a base enumerated balue.
1 parent 8fe79e6 commit 09c2712

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
77

88
## [Unreleased]
99

10+
- Fixed re-export of derived enumeration values
11+
1012
## [v0.32.0] - 2024-02-26
1113

1214
- Bump MSRV to 1.74

src/generate/register.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -691,8 +691,13 @@ pub fn fields(
691691
if let Some(dpath) = dpath {
692692
epath = Some(derive_enumerated_values(&mut ev, &dpath, &fpath, index)?);
693693
// TODO: remove this hack
694-
if let Some(epath) = epath.as_ref() {
695-
ev = (*index.evs.get(epath).unwrap()).clone();
694+
//if let Some(epath) = epath.as_ref() {
695+
// ev = (*index.evs.get(epath).unwrap()).clone();
696+
//}
697+
// The field name is used in the enumerated_value name,
698+
// if the enumerated_value does not have a name.
699+
if ev.name == None {
700+
ev.name = Some(f.name.clone());
696701
}
697702
} else if let Some(path) = fdpath.as_ref() {
698703
epath = Some(

0 commit comments

Comments
 (0)