pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-12 07:21:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify variant serialize patterns

Browse Source
This commit is contained in:
David Tolnay
2016-12-24 12:18:02 -05:00
parent 49e985eb90
commit a020cceed8
1 changed files with 6 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_codegen/src/ser.rs
+6 -32
View File
@@ -266,40 +266,17 @@ fn serialize_variant(
match variant.style { match variant.style {
Style::Unit => { Style::Unit => {
quote! { quote! {
#type_ident::#variant_ident => #skipped_err, #type_ident::#variant_ident => #skipped_err,
} }
}, },
Style::Newtype => { Style::Newtype | Style::Tuple => {
quote! { quote! {
#type_ident::#variant_ident(ref __simple_value) => #skipped_err, #type_ident::#variant_ident(..) => #skipped_err,
} }
}, },
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 pat = quote!(#type_ident::#variant_ident(#(#field_names),*));
quote! {
#pat => #skipped_err,
}
}
Style::Struct => { 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 pat = quote!(#type_ident::#variant_ident { #(#fields),* });
quote! { quote! {
#pat => #skipped_err, #type_ident::#variant_ident{..} => #skipped_err,
} }
} }
} }
@@ -338,8 +315,6 @@ fn serialize_variant(
}) })
.collect(); .collect();
let pat = quote!(#type_ident::#variant_ident(#(#field_names),*));
let block = serialize_tuple_variant( let block = serialize_tuple_variant(
type_name, type_name,
variant_index, variant_index,
@@ -350,7 +325,7 @@ fn serialize_variant(
); );
quote! { quote! {
#pat => { #block } #type_ident::#variant_ident(#(#field_names),*) => { #block }
} }
} }
Style::Struct => { Style::Struct => {
@@ -361,7 +336,6 @@ fn serialize_variant(
}; };
quote!(ref #id) quote!(ref #id)
}); });
let pat = quote!(#type_ident::#variant_ident { #(#fields),* });
let block = serialize_struct_variant( let block = serialize_struct_variant(
variant_index, variant_index,
@@ -373,7 +347,7 @@ fn serialize_variant(
); );
quote! { quote! {
#pat => { #block } #type_ident::#variant_ident { #(#fields),* } => { #block }
} }
} }
} }