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

Further simplify variant serialization patterns

Browse Source
This commit is contained in:
David Tolnay 2016-12-24 12:26:02 -05:00
parent a020cceed8
commit 57d3fce0c6
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
serde_codegen/src/ser.rs
View File

@ -308,12 +308,8 @@ fn serialize_variant(
}
},
Style::Tuple => {
let field_names: Vec<Tokens> = (0 .. variant.fields.len())
.map(|i| {
let id = aster::id(format!("__field{}", i));
quote!(ref #id)
})
.collect();
let field_names = (0 .. variant.fields.len())
.map(|i| aster::id(format!("__field{}", i)));
let block = serialize_tuple_variant(
type_name,
@ -325,17 +321,12 @@ fn serialize_variant(
);
quote! {
#type_ident::#variant_ident(#(#field_names),*) => { #block }
#type_ident::#variant_ident(#(ref #field_names),*) => { #block }
}
}
Style::Struct => {
let fields = variant.fields.iter().map(|field| {
let id = match field.ident {
Some(ref name) => name.clone(),
None => panic!("struct variant has unnamed fields"),
};
quote!(ref #id)
});
let fields = variant.fields.iter()
.map(|f| f.ident.clone().expect("struct variant has unnamed fields"));
let block = serialize_struct_variant(
variant_index,
@ -347,7 +338,7 @@ fn serialize_variant(
);
quote! {
#type_ident::#variant_ident { #(#fields),* } => { #block }
#type_ident::#variant_ident { #(ref #fields),* } => { #block }
}
}
}