Merge pull request #264 from rust-embedded/merge

Keep position when merge fields, release 0.4
rust-embedded · Jan 6, 2025 · 666ee0d · 666ee0d
2 parents d5379fc + a0c7bf3
commit 666ee0d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/CHANGELOG-rust.md b/CHANGELOG-rust.md
@@ -5,6 +5,11 @@ This changelog tracks the Rust `svdtools` project. See
 
 ## [Unreleased]
 
+## [v0.4.0] 2025-01-06
+
+* **breaking** Support "?~" in field `_modify` & `_derive`
+* Keep position when merge fields
+
 ## [v0.3.21] 2024-12-31
 
 * `_derive` field
@@ -195,7 +200,8 @@ Other changes:
 
 * Initial release with feature-parity with the Python project.
 
-[Unreleased]: https://github.com/rust-embedded/svdtools/compare/v0.3.21...HEAD
+[Unreleased]: https://github.com/rust-embedded/svdtools/compare/v0.4.0...HEAD
+[v0.4.0]: https://github.com/rust-embedded/svdtools/compare/v0.3.21...v0.4.0
 [v0.3.21]: https://github.com/rust-embedded/svdtools/compare/v0.3.20...v0.3.21
 [v0.3.20]: https://github.com/rust-embedded/svdtools/compare/v0.3.19...v0.3.20
 [v0.3.19]: https://github.com/rust-embedded/svdtools/compare/v0.3.18...v0.3.19

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "svdtools"
-version = "0.3.21"
+version = "0.4.0"
 repository = "https://github.com/rust-embedded/svdtools/"
 description = "Tool for modifying bugs in CMSIS SVD"
 authors = ["Andrey Zgarbul <[email protected]>", "MarcoIeni"]

diff --git a/src/patch/register.rs b/src/patch/register.rs
@@ -454,23 +454,26 @@ impl RegisterExt for Register {
                 "Could not find any fields to merge {rpath}:{key}. Present fields: {present}.`"
             ));
         }
-        let mut bitwidth = 0;
-        let mut bitoffset = u32::MAX;
-        let mut first = true;
-        let mut desc = None;
         if let Some(fields) = self.fields.as_mut() {
-            for f in fields.iter_mut() {
+            let mut bitwidth = 0;
+            let mut bitoffset = u32::MAX;
+            let mut pos = usize::MAX;
+            let mut first = true;
+            let mut desc = None;
+            for (i, f) in fields.iter_mut().enumerate() {
                 if names.contains(&f.name) {
                     if first {
                         desc.clone_from(&f.description);
                         first = false;
                     }
                     bitwidth += f.bit_range.width;
                     bitoffset = bitoffset.min(f.bit_range.offset);
+                    pos = pos.min(i);
                 }
             }
             fields.retain(|f| !names.contains(&f.name));
-            fields.push(
+            fields.insert(
+                pos,
                 FieldInfo::builder()
                     .name(name)
                     .description(desc)