NationTech/yaserde
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation errors when element name contains dots

Browse Source
This commit is contained in:
Dmitry Samoylov
2020-02-04 15:18:09 +07:00
parent 6bbb9676d0
commit 688ab0b160
4 changed files with 79 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
yaserde_derive/src/de/expand_struct.rs
View File

@@ -207,7 +207,7 @@ pub fn parse(
.rename
.unwrap_or_else(|| field.ident.as_ref().unwrap().to_string());
let visitor_label = Ident::new(&format!("__Visitor{}", label_name), Span::call_site());
let visitor_label = build_visitor_ident(&label_name, None);
match get_field_type(field) {
Some(FieldType::FieldTypeString) => {
@@ -252,10 +252,7 @@ pub fn parse(
.iter()
.map(|s| s.ident.to_string())
.collect();
let struct_ident = Ident::new(
&format!("__Visitor_{}_{}", label_name, struct_id),
Span::call_site(),
);
let struct_ident = build_visitor_ident(&label_name, Some(&struct_id));
Some(quote! {
#[allow(non_snake_case, non_camel_case_types)]
@@ -405,11 +402,10 @@ pub fn parse(
return None;
}
let label_name = if let Some(ref value) = field_attrs.rename {
Ident::new(&value.to_string(), Span::call_site()).to_string()
} else {
field.ident.clone().unwrap().to_string()
};
let label_name = field_attrs
.rename
.clone()
.unwrap_or_else(|| label.as_ref().unwrap().to_string());
match get_field_type(field) {
Some(FieldType::FieldTypeString) => {
@@ -899,7 +895,7 @@ pub fn parse(
.rename
.unwrap_or_else(|| field.ident.as_ref().unwrap().to_string());
let visitor_label = Ident::new(&format!("__Visitor{}", label_name), Span::call_site());
let visitor_label = build_visitor_ident(&label_name, None);
match get_field_type(field) {
Some(FieldType::FieldTypeString) => Some(quote! {
@@ -1077,13 +1073,9 @@ pub fn parse(
}
}
Some(FieldType::FieldTypeStruct { struct_name }) => {
let struct_ident = Ident::new(
&format!(
"__Visitor_{}_{}",
label_name,
struct_name.into_token_stream()
),
Span::call_site(),
let struct_ident = build_visitor_ident(
&label_name,
Some(&struct_name.into_token_stream().to_string()),
);
Some(quote! {
@@ -1307,12 +1299,12 @@ fn build_call_visitor(
// let label = &field.ident;
let value_label = get_value_label(label);
let label_name = if let Some(ref value) = field_attrs.rename {
Ident::new(&value.to_string(), Span::call_site()).to_string()
} else {
label.clone().unwrap().to_string()
};
let visitor_label = Ident::new(&format!("__Visitor{}", label_name), Span::call_site());
let label_name = field_attrs
.rename
.clone()
.unwrap_or_else(|| label.as_ref().unwrap().to_string());
let visitor_label = build_visitor_ident(&label_name, None);
let namespaces_matches: TokenStream = namespaces
.iter()
@@ -1410,3 +1402,14 @@ fn get_value_label(ident: &Option<syn::Ident>) -> Option<syn::Ident> {
None => None,
}
}
fn build_visitor_ident(label: &str, struct_id: Option<&str>) -> Ident {
Ident::new(
&format!(
"__Visitor_{}_{}",
label.replace(".", "_"),
struct_id.unwrap_or("")
),
Span::call_site(),
)
}

36
yaserde_derive/src/ser/expand_struct.rs
View File

@@ -24,16 +24,9 @@ pub fn serialize(
return None;
}
let renamed_label = match field_attrs.rename {
Some(value) => Ident::new(&value, Span::call_site()),
None => field.ident.clone().unwrap(),
};
let label = &field.ident;
let label_name = if let Some(prefix) = field_attrs.prefix {
prefix + ":" + renamed_label.to_string().as_ref()
} else {
renamed_label.to_string()
};
let label_name = build_label_name(&field, &field_attrs);
match get_field_type(field) {
Some(FieldType::FieldTypeString)
@@ -270,16 +263,7 @@ pub fn serialize(
));
}
let renamed_label = match field_attrs.rename {
Some(value) => Ident::new(&value, Span::call_site()),
None => field.ident.clone().unwrap(),
};
let label_name = if let Some(prefix) = field_attrs.prefix {
format!("{}:{}", prefix, renamed_label)
} else {
renamed_label.to_string()
};
let label_name = build_label_name(&field, &field_attrs);
match get_field_type(field) {
Some(FieldType::FieldTypeString)
@@ -473,3 +457,17 @@ pub fn serialize(
}
}
}
fn build_label_name(field: &syn::Field, field_attrs: &YaSerdeAttribute) -> String {
format!(
"{}{}",
field_attrs
.prefix
.clone()
.map_or("".to_string(), |prefix| prefix + ":"),
field_attrs
.rename
.clone()
.unwrap_or_else(|| field.ident.as_ref().unwrap().to_string())
)
}