instant-labs
/
instant-xml
mirror of https://github.com/instant-labs/instant-xml.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve support for raw identifier field names

This commit is contained in:
Dirkjan Ochtman 2023-02-22 21:30:36 +01:00
parent 6c4cd8bd55
commit 8c2964b318
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
instant-xml-macros/src/case.rs
View File

@ -95,7 +95,11 @@ impl RenameRule {
/// Apply a renaming rule to a struct field, returning the version expected in the source. /// Apply a renaming rule to a struct field, returning the version expected in the source.
pub fn apply_to_field(&self, ident: &Ident) -> String { pub fn apply_to_field(&self, ident: &Ident) -> String {
let field = ident.to_string(); let mut field = ident.to_string();
if field.starts_with("r#") {
field = field[2..].to_string();
}
match *self { match *self {
None | LowerCase | SnakeCase => field, None | LowerCase | SnakeCase => field,
UpperCase => field.to_ascii_uppercase(), UpperCase => field.to_ascii_uppercase(),

2
instant-xml/tests/de-nested.rs
View File

@ -13,7 +13,7 @@ struct NestedDe {
#[xml(ns("URI", bar = "BAZ", foo = "BAR"))] #[xml(ns("URI", bar = "BAZ", foo = "BAR"))]
struct StructWithCustomFieldFromXml { struct StructWithCustomFieldFromXml {
#[xml(ns(BAR))] #[xml(ns(BAR))]
flag: bool, r#flag: bool,
#[xml(attribute)] #[xml(attribute)]
flag_attribute: bool, flag_attribute: bool,
test: NestedDe, test: NestedDe,