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

Format variant-skip message only if variant is skipped

Browse Source
This commit is contained in:
David Tolnay 2016-12-24 13:10:06 -05:00
parent 2401ae61a8
commit 28d67f4172
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
serde_codegen/src/ser.rs
View File

@ -256,29 +256,19 @@ fn serialize_variant(
let variant_ident = variant.ident.clone(); let variant_ident = variant.ident.clone();
let variant_name = variant.attrs.name().serialize_name(); let variant_name = variant.attrs.name().serialize_name();
let skipped_msg = format!("The enum variant {}::{} cannot be serialized",
type_ident, variant_ident);
let skipped_err = quote! {
Err(_serde::ser::Error::invalid_value(#skipped_msg))
};
if variant.attrs.skip_serializing() { if variant.attrs.skip_serializing() {
match variant.style { let skipped_msg = format!("The enum variant {}::{} cannot be serialized",
Style::Unit => { type_ident, variant_ident);
quote! { let skipped_err = quote! {
#type_ident::#variant_ident => #skipped_err, Err(_serde::ser::Error::invalid_value(#skipped_msg))
} };
}, let fields_pat = match variant.style {
Style::Newtype | Style::Tuple => { Style::Unit => quote!(),
quote! { Style::Newtype | Style::Tuple => quote!( (..) ),
#type_ident::#variant_ident(..) => #skipped_err, Style::Struct => quote!( {..} ),
} };
}, quote! {
Style::Struct => { #type_ident::#variant_ident #fields_pat => #skipped_err,
quote! {
#type_ident::#variant_ident{..} => #skipped_err,
}
}
} }
} else { // variant wasn't skipped } else { // variant wasn't skipped
match variant.style { match variant.style {