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

Omit missing content match if not needed

Browse Source
This commit is contained in:
David Tolnay 2020-05-09 20:55:55 -07:00
parent 9476838264
commit 9433004307
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
serde_derive/src/de.rs
View File

@ -1377,8 +1377,11 @@ fn deserialize_adjacently_tagged_enum(
}
};
let mut missing_content = quote! {
_serde::export::Err(<__A::Error as _serde::de::Error>::missing_field(#content))
};
let mut missing_content_fallthrough = quote!();
let missing_content_arms = variants
let mut missing_content_arms = variants
.iter()
.enumerate()
.filter(|&(_, variant)| !variant.attrs.skip_deserializing())
@ -1398,22 +1401,23 @@ fn deserialize_adjacently_tagged_enum(
}
}
_ => {
missing_content_fallthrough = quote! {
_ => _serde::export::Err(<__A::Error as _serde::de::Error>::missing_field(#content))
};
missing_content_fallthrough = quote!(_ => #missing_content);
return None;
}
};
Some(quote! {
__Field::#variant_index => #arm,
})
});
let missing_content = quote! {
match __field {
#(#missing_content_arms)*
#missing_content_fallthrough
}
};
})
.peekable();
if missing_content_arms.peek().is_some() {
missing_content = quote! {
match __field {
#(#missing_content_arms)*
#missing_content_fallthrough
}
};
}
// Advance the map by one key, returning early in case of error.
let next_key = quote! {