trailing _

rust-embedded · Feb 3, 2024 · 5cf7959 · 5cf7959
1 parent 55a14ea
commit 5cf7959
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 ## [Unreleased]
 
 - Add `base-address-shift` config flag
+- Use `PascalCase` for type idents, fix case changing bugs
 
 ## [v0.31.5] - 2024-01-04
 

diff --git a/src/util.rs b/src/util.rs
@@ -35,11 +35,20 @@ impl Case {
                 {
                     if first != 0 {
                         let (prefix, s) = cow.split_at(first);
-                        format!("{prefix}{}", s.to_pascal_case()).into()
+                        // Keep trailing "_"
+                        if let Some(s) = s.strip_suffix('_') {
+                            format!("{prefix}{}_", s.to_pascal_case()).into()
+                        } else {
+                            format!("{prefix}{}", s.to_pascal_case()).into()
+                        }
                     } else {
-                        match cow {
-                            Cow::Borrowed(s) if s.is_pascal_case() => cow,
-                            _ => cow.to_pascal_case().into(),
+                        if let Some(s) = cow.strip_suffix('_') {
+                            format!("{}_", s.to_pascal_case()).into()
+                        } else {
+                            match cow {
+                                Cow::Borrowed(s) if s.is_pascal_case() => cow,
+                                _ => cow.to_pascal_case().into(),
+                            }
                         }
                     }
                 } else {