From 1157ac01188d44c6a4133a2f47ad106cc471e2b7 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Thu, 12 Apr 2018 23:48:38 -0700 Subject: [PATCH] Eliminate unnecessary braces in wrap_deserialize_variant_with --- serde_derive/src/de.rs | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/serde_derive/src/de.rs b/serde_derive/src/de.rs index 4082545d..4253c286 100644 --- a/serde_derive/src/de.rs +++ b/serde_derive/src/de.rs @@ -2600,36 +2600,28 @@ fn wrap_deserialize_variant_with( let unwrap_fn = match variant.style { Style::Struct if variant.fields.len() == 1 => { let field_ident = variant.fields[0].ident.unwrap(); - quote!({ - |__wrap| { - #this::#variant_ident { #field_ident: __wrap.value } - } - }) + quote! { + |__wrap| #this::#variant_ident { #field_ident: __wrap.value } + } } Style::Struct => { let field_idents = variant .fields .iter() .map(|field| field.ident.as_ref().unwrap()); - quote!({ - |__wrap| { - #this::#variant_ident { #(#field_idents: __wrap.value.#field_access),* } - } - }) + quote! { + |__wrap| #this::#variant_ident { #(#field_idents: __wrap.value.#field_access),* } + } } - Style::Tuple => quote!({ - |__wrap| { - #this::#variant_ident(#(__wrap.value.#field_access),*) - } - }), - Style::Newtype => quote!({ - |__wrap| { - #this::#variant_ident(__wrap.value) - } - }), - Style::Unit => quote!({ - |__wrap| { #this::#variant_ident } - }), + Style::Tuple => quote! { + |__wrap| #this::#variant_ident(#(__wrap.value.#field_access),*) + }, + Style::Newtype => quote! { + |__wrap| #this::#variant_ident(__wrap.value) + }, + Style::Unit => quote! { + |__wrap| #this::#variant_ident + }, }; (wrapper, wrapper_ty, unwrap_fn)