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

Rename fields to raw keywords

This commit is contained in:
Dirkjan Ochtman 2022-09-07 09:23:53 +02:00
parent 674039a791
commit cd37e306ad
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
instant-xml-macros/src/de.rs
View File

@ -65,16 +65,16 @@ pub(crate) fn from_xml(input: &syn::DeriveInput) -> TokenStream {
}; };
// Elements // Elements
let elements_enum = elements_tokens.enum_; let elements_enum = elements_tokens.r#enum;
let elements_consts = elements_tokens.consts; let elements_consts = elements_tokens.consts;
let elements_names = elements_tokens.names; let elements_names = elements_tokens.names;
let elem_type_match = elements_tokens.match_; let elem_type_match = elements_tokens.r#match;
// Attributes // Attributes
let attributes_enum = attributes_tokens.enum_; let attributes_enum = attributes_tokens.r#enum;
let attributes_consts = attributes_tokens.consts; let attributes_consts = attributes_tokens.consts;
let attributes_names = attributes_tokens.names; let attributes_names = attributes_tokens.names;
let attr_type_match = attributes_tokens.match_; let attr_type_match = attributes_tokens.r#match;
let name = ident.to_string(); let name = ident.to_string();
quote!( quote!(
@ -167,7 +167,7 @@ fn process_field(
discard_lifetimes(&mut no_lifetime_type); discard_lifetimes(&mut no_lifetime_type);
let enum_name = Ident::new(&format!("__Value{index}"), Span::call_site()); let enum_name = Ident::new(&format!("__Value{index}"), Span::call_site());
tokens.enum_.extend(quote!(#enum_name,)); tokens.r#enum.extend(quote!(#enum_name,));
let default_ns = match &field_meta.ns.uri { let default_ns = match &field_meta.ns.uri {
None => &container_meta.ns.uri, None => &container_meta.ns.uri,
@ -201,7 +201,7 @@ fn process_field(
)); ));
if !field_meta.attribute { if !field_meta.attribute {
tokens.match_.extend(quote!( tokens.r#match.extend(quote!(
__Elements::#enum_name => { __Elements::#enum_name => {
if #enum_name.is_some() { if #enum_name.is_some() {
return Err(Error::DuplicateValue); return Err(Error::DuplicateValue);
@ -212,7 +212,7 @@ fn process_field(
}, },
)); ));
} else { } else {
tokens.match_.extend(quote!( tokens.r#match.extend(quote!(
__Attributes::#enum_name => { __Attributes::#enum_name => {
if #enum_name.is_some() { if #enum_name.is_some() {
return Err(Error::DuplicateValue); return Err(Error::DuplicateValue);
@ -233,19 +233,19 @@ fn process_field(
} }
struct Tokens { struct Tokens {
enum_: TokenStream, r#enum: TokenStream,
consts: TokenStream, consts: TokenStream,
names: TokenStream, names: TokenStream,
match_: TokenStream, r#match: TokenStream,
} }
impl Default for Tokens { impl Default for Tokens {
fn default() -> Self { fn default() -> Self {
Self { Self {
enum_: TokenStream::new(), r#enum: TokenStream::new(),
consts: TokenStream::new(), consts: TokenStream::new(),
names: TokenStream::new(), names: TokenStream::new(),
match_: TokenStream::new(), r#match: TokenStream::new(),
} }
} }
} }