diff --git a/serde_derive/src/de.rs b/serde_derive/src/de.rs index d54309c8..1ce32184 100644 --- a/serde_derive/src/de.rs +++ b/serde_derive/src/de.rs @@ -1692,20 +1692,15 @@ fn deserialize_externally_tagged_variant( if variant.fields[0].attrs.skip_deserializing() { let this = ¶ms.this; let let_default = match variant.fields[0].attrs.default() { - attr::Default::Default => quote!( - _serde::export::Default::default() - ), - attr::Default::Path(ref path) => quote!( - #path() - ), + attr::Default::Default => quote!(_serde::export::Default::default()), + attr::Default::Path(ref path) => quote!(#path()), attr::Default::None => unimplemented!(), }; - return quote_block! { try!(_serde::de::VariantAccess::unit_variant(__variant)); _serde::export::Ok(#this::#variant_ident(#let_default)) - }; + }; } deserialize_externally_tagged_newtype_variant(variant_ident, params, &variant.fields[0]) } @@ -1859,12 +1854,8 @@ fn deserialize_untagged_newtype_variant( None => { if field.attrs.skip_deserializing() { let let_default = match field.attrs.default() { - attr::Default::Default => quote!( - _serde::export::Default::default() - ), - attr::Default::Path(ref path) => quote!( - #path() - ), + attr::Default::Default => quote!(_serde::export::Default::default()), + attr::Default::Path(ref path) => quote!(#path()), attr::Default::None => unimplemented!(), }; diff --git a/serde_derive/src/ser.rs b/serde_derive/src/ser.rs index e79b8e7e..e2065b7b 100644 --- a/serde_derive/src/ser.rs +++ b/serde_derive/src/ser.rs @@ -530,7 +530,7 @@ fn serialize_externally_tagged_variant( #variant_index, #variant_name, ) - } + }; } let mut field_expr = quote!(__field0); if let Some(path) = field.attrs.serialize_with() { @@ -678,13 +678,13 @@ fn serialize_adjacently_tagged_variant( Style::Newtype => { let field = &variant.fields[0]; if field.attrs.skip_serializing() { - return quote_block! { + return quote_block! { let mut __struct = try!(_serde::Serializer::serialize_struct( __serializer, #type_name, 1)); try!(_serde::ser::SerializeStruct::serialize_field( &mut __struct, #tag, #variant_name)); _serde::ser::SerializeStruct::end(__struct) - }; + }; } let mut field_expr = quote!(__field0); if let Some(path) = field.attrs.serialize_with() { diff --git a/test_suite/tests/test_ser.rs b/test_suite/tests/test_ser.rs index 68293f5a..a62569af 100644 --- a/test_suite/tests/test_ser.rs +++ b/test_suite/tests/test_ser.rs @@ -313,8 +313,13 @@ declare_tests! { ], } test_enum { - Enum::Unit => &[Token::UnitVariant { name: "Enum", variant: "Unit" }], - Enum::One(42) => &[Token::NewtypeVariant { name: "Enum", variant: "One" }, Token::I32(42)], + Enum::Unit => &[ + Token::UnitVariant { name: "Enum", variant: "Unit" }, + ], + Enum::One(42) => &[ + Token::NewtypeVariant { name: "Enum", variant: "One" }, + Token::I32(42), + ], Enum::Seq(1, 2) => &[ Token::TupleVariant { name: "Enum", variant: "Seq", len: 2 }, Token::I32(1), @@ -330,7 +335,9 @@ declare_tests! { Token::I32(2), Token::StructVariantEnd, ], - Enum::OneWithSkipped(NotSerializable) => &[Token::UnitVariant {name: "Enum", variant: "OneWithSkipped" }], + Enum::OneWithSkipped(NotSerializable) => &[ + Token::UnitVariant { name: "Enum", variant: "OneWithSkipped" }, + ], } test_box { Box::new(0i32) => &[Token::I32(0)],