pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-04-23 08:18:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix case of skipped variant followed by other variants

Browse Source
This commit is contained in:
David Tolnay
2017-01-12 23:35:39 -08:00
parent 4ef1128546
commit cb5e7c6264
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_codegen/src/de.rs
+18 -16
View File
@@ -499,25 +499,27 @@ fn deserialize_item_enum(
};
// Match arms to extract a variant from a string
let mut variant_arms = vec![];
for (i, variant) in variants.iter().filter(|variant| !variant.attrs.skip_deserializing()).enumerate() {
let variant_name = field_i(i);
let variant_arms = variants.iter()
.enumerate()
.filter(|&(_, variant)| !variant.attrs.skip_deserializing())
.map(|(i, variant)| {
let variant_name = field_i(i);
let block = deserialize_variant(
type_ident,
impl_generics,
ty.clone(),
variant,
item_attrs,
);
let block = deserialize_variant(
type_ident,
impl_generics,
ty.clone(),
variant,
item_attrs,
);
let arm = quote! {
__Field::#variant_name => #block
};
variant_arms.push(arm);
}
quote! {
__Field::#variant_name => #block
}
});
let match_variant = if variant_arms.is_empty() {
let all_skipped = variants.iter().all(|variant| variant.attrs.skip_deserializing());
let match_variant = if all_skipped {
// This is an empty enum like `enum Impossible {}` or an enum in which
// all variants have `#[serde(skip_deserializing)]`.
quote! {