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

Put struct and simple_type visitors close to each other

Browse Source
This commit is contained in:
Dmitry Samoylov 2020-02-12 19:38:02 +07:00
parent 20d7db6d73
commit 476fd3790e
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,8 +100,6 @@ pub fn parse(
.rename .rename
.unwrap_or_else(|| field.ident.as_ref().unwrap().to_string()); .unwrap_or_else(|| field.ident.as_ref().unwrap().to_string());
let visitor_label = build_visitor_ident(&label_name, field.span(), None);
let struct_visitor = |struct_name: syn::Path| { let struct_visitor = |struct_name: syn::Path| {
let struct_id: String = struct_name let struct_id: String = struct_name
.segments .segments
@ -109,12 +107,12 @@ pub fn parse(
.map(|s| s.ident.to_string()) .map(|s| s.ident.to_string())
.collect(); .collect();
let struct_ident = build_visitor_ident(&label_name, field.span(), Some(&struct_name)); let visitor_label = build_visitor_ident(&label_name, field.span(), Some(&struct_name));
Some(quote! { Some(quote! {
#[allow(non_snake_case, non_camel_case_types)] #[allow(non_snake_case, non_camel_case_types)]
struct #struct_ident; struct #visitor_label;
impl<'de> Visitor<'de> for #struct_ident { impl<'de> Visitor<'de> for #visitor_label {
type Value = #struct_name; type Value = #struct_name;
fn visit_str(self, v: &str) -> Result<Self::Value, String> { fn visit_str(self, v: &str) -> Result<Self::Value, String> {
@ -127,11 +125,21 @@ pub fn parse(
}; };
let simple_type_visitor = |simple_type: FieldType| { let simple_type_visitor = |simple_type: FieldType| {
build_declare_visitor( let field_type = get_simple_type_token(&simple_type);
&get_simple_type_token(&simple_type), let visitor = get_simple_type_visitor(&simple_type);
&get_simple_type_visitor(&simple_type), let visitor_label = build_visitor_ident(&label_name, field.span(), None);
&visitor_label,
) Some(quote! {
#[allow(non_snake_case, non_camel_case_types)]
struct #visitor_label;
impl<'de> Visitor<'de> for #visitor_label {
type Value = #field_type;
fn #visitor(self, v: &str) -> Result<Self::Value, String> {
Ok(#field_type::from_str(v).unwrap())
}
}
})
}; };
get_field_type(field).and_then(|f| match f { get_field_type(field).and_then(|f| match f {
@ -433,24 +441,6 @@ pub fn parse(
} }
} }
fn build_declare_visitor(
field_type: &TokenStream,
visitor: &TokenStream,
visitor_label: &Ident,
) -> Option<TokenStream> {
Some(quote! {
#[allow(non_snake_case, non_camel_case_types)]
struct #visitor_label;
impl<'de> Visitor<'de> for #visitor_label {
type Value = #field_type;
fn #visitor(self, v: &str) -> Result<Self::Value, String> {
Ok(#field_type::from_str(v).unwrap())
}
}
})
}
fn build_call_visitor( fn build_call_visitor(
field_type: &TokenStream, field_type: &TokenStream,
visitor: &TokenStream, visitor: &TokenStream,