revert to inflections

Author: burrbull

CHANGELOG.md

@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 ## [Unreleased]
 
 - Bump MSRV to 1.65
-- Replace `inflections` with `convert_case`, optimize case change/sanitize
+- Optimize case change/sanitize
 - Fix dangling implicit derives
 - Fix escaping <> and & characters in doc attributes
 

Cargo.toml

@@ -46,7 +46,7 @@ yaml = ["dep:serde_yaml"]
 clap = { version = "4.0", optional = true }
 irx-config = { version = "3.1", features = ["cmd", "toml-parser"], optional = true }
 env_logger = { version = "0.10", optional = true }
-convert_case = "0.6"
+inflections = "1.1"
 log = { version = "~0.4", features = ["std"] }
 quote = "1.0"
 proc-macro2 = "1.0"

src/util.rs

@@ -2,6 +2,7 @@ use std::borrow::Cow;
 
 use crate::svd::{Access, Device, DimElement, Field, RegisterInfo, RegisterProperties};
 use html_escape::encode_text_minimal;
+use inflections::Inflect;
 use proc_macro2::{Ident, Span, TokenStream};
 use quote::quote;
 use std::collections::HashSet;
@@ -69,45 +70,43 @@ pub enum Case {
 
 impl Case {
     pub fn to_case<'a>(&self, s: &'a str) -> Cow<'a, str> {
-        use convert_case::{Case as CCase, Casing};
         match self {
             Self::Constant => {
-                if s.is_case(CCase::UpperSnake) {
+                if s.is_constant_case() {
                     s.into()
                 } else {
-                    s.to_case(CCase::UpperSnake).into()
+                    s.to_constant_case().into()
                 }
             }
             Self::Pascal => {
-                if s.is_case(CCase::Pascal) {
+                if s.is_pascal_case() {
                     s.into()
                 } else {
-                    s.to_case(CCase::Pascal).into()
+                    s.to_pascal_case().into()
                 }
             }
             Self::Snake => {
-                if s.is_case(CCase::Snake) {
+                if s.is_snake_case() {
                     s.into()
                 } else {
-                    s.to_case(CCase::Snake).into()
+                    s.to_snake_case().into()
                 }
             }
         }
     }
     pub fn cow_to_case<'a>(&self, cow: Cow<'a, str>) -> Cow<'a, str> {
-        use convert_case::{Case as CCase, Casing};
         match self {
             Self::Constant => match cow {
-                Cow::Borrowed(s) if s.is_case(CCase::UpperSnake) => cow,
-                _ => cow.to_case(CCase::UpperSnake).into(),
+                Cow::Borrowed(s) if s.is_constant_case() => cow,
+                _ => cow.to_constant_case().into(),
             },
             Self::Pascal => match cow {
-                Cow::Borrowed(s) if s.is_case(CCase::Pascal) => cow,
-                _ => cow.to_case(CCase::Pascal).into(),
+                Cow::Borrowed(s) if s.is_pascal_case() => cow,
+                _ => cow.to_pascal_case().into(),
             },
             Self::Snake => match cow {
-                Cow::Borrowed(s) if s.is_case(CCase::Snake) => cow,
-                _ => cow.to_case(CCase::Snake).into(),
+                Cow::Borrowed(s) if s.is_snake_case() => cow,
+                _ => cow.to_snake_case().into(),
             },
         }
     }