mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move deserialize_generated_identifier out from if because the call is same in both arms

Browse Source
This commit is contained in:
Mingun 2023-05-01 01:49:11 +05:00 committed by Mingun
parent fb3a9e0d7c
commit bbbd1d24c9
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
serde_derive/src/de.rs
View File

@ -954,28 +954,12 @@ fn deserialize_struct(
) )
}) })
.collect(); .collect();
let (field_visitor, fields_stmt) = if cattrs.has_flatten() { let field_visitor = Stmts(deserialize_generated_identifier(
let field_visitor = deserialize_generated_identifier(&field_names_idents, cattrs, false, None); &field_names_idents,
cattrs,
(field_visitor, None) false,
} else { None,
let fields_stmt = { ));
let field_names = field_names_idents
.iter()
.flat_map(|(_, _, aliases)| aliases);
quote_block! {
#[doc(hidden)]
const FIELDS: &'static [&'static str] = &[ #(#field_names),* ];
}
};
let field_visitor = deserialize_generated_identifier(&field_names_idents, cattrs, false, None);
(field_visitor, Some(fields_stmt))
};
let field_visitor = Stmts(field_visitor);
let fields_stmt = fields_stmt.map(Stmts);
// untagged struct variants do not get a visit_seq method. The same applies to // untagged struct variants do not get a visit_seq method. The same applies to
// structs that only have a map representation. // structs that only have a map representation.
@ -1024,6 +1008,19 @@ fn deserialize_struct(
None None
}; };
let fields_stmt = if cattrs.has_flatten() {
None
} else {
let field_names = field_names_idents
.iter()
.flat_map(|(_, _, aliases)| aliases);
Some(quote! {
#[doc(hidden)]
const FIELDS: &'static [&'static str] = &[ #(#field_names),* ];
})
};
let visitor_expr = quote! { let visitor_expr = quote! {
__Visitor { __Visitor {
marker: _serde::__private::PhantomData::<#this_type #ty_generics>, marker: _serde::__private::PhantomData::<#this_type #ty_generics>,