pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-17 10:21:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format with rustfmt 2019-08-19

Browse Source
This commit is contained in:
David Tolnay
2019-09-07 20:35:07 -07:00
parent 111c18dec3
commit 187a0a3ec0
3 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_derive/src/de.rs
+5 -14
View File
@@ -1692,20 +1692,15 @@ fn deserialize_externally_tagged_variant(
if variant.fields[0].attrs.skip_deserializing() { if variant.fields[0].attrs.skip_deserializing() {
let this = &params.this; let this = &params.this;
let let_default = match variant.fields[0].attrs.default() { let let_default = match variant.fields[0].attrs.default() {
attr::Default::Default => quote!( attr::Default::Default => quote!(_serde::export::Default::default()),
_serde::export::Default::default() attr::Default::Path(ref path) => quote!(#path()),
),
attr::Default::Path(ref path) => quote!(
#path()
),
attr::Default::None => unimplemented!(), attr::Default::None => unimplemented!(),
}; };
return quote_block! { return quote_block! {
try!(_serde::de::VariantAccess::unit_variant(__variant)); try!(_serde::de::VariantAccess::unit_variant(__variant));
_serde::export::Ok(#this::#variant_ident(#let_default)) _serde::export::Ok(#this::#variant_ident(#let_default))
}; };
} }
deserialize_externally_tagged_newtype_variant(variant_ident, params, &variant.fields[0]) deserialize_externally_tagged_newtype_variant(variant_ident, params, &variant.fields[0])
} }
@@ -1859,12 +1854,8 @@ fn deserialize_untagged_newtype_variant(
None => { None => {
if field.attrs.skip_deserializing() { if field.attrs.skip_deserializing() {
let let_default = match field.attrs.default() { let let_default = match field.attrs.default() {
attr::Default::Default => quote!( attr::Default::Default => quote!(_serde::export::Default::default()),
_serde::export::Default::default() attr::Default::Path(ref path) => quote!(#path()),
),
attr::Default::Path(ref path) => quote!(
#path()
),
attr::Default::None => unimplemented!(), attr::Default::None => unimplemented!(),
}; };
serde_derive/src/ser.rs
+3 -3
View File
@@ -530,7 +530,7 @@ fn serialize_externally_tagged_variant(
#variant_index, #variant_index,
#variant_name, #variant_name,
) )
} };
} }
let mut field_expr = quote!(__field0); let mut field_expr = quote!(__field0);
if let Some(path) = field.attrs.serialize_with() { if let Some(path) = field.attrs.serialize_with() {
@@ -678,13 +678,13 @@ fn serialize_adjacently_tagged_variant(
Style::Newtype => { Style::Newtype => {
let field = &variant.fields[0]; let field = &variant.fields[0];
if field.attrs.skip_serializing() { if field.attrs.skip_serializing() {
return quote_block! { return quote_block! {
let mut __struct = try!(_serde::Serializer::serialize_struct( let mut __struct = try!(_serde::Serializer::serialize_struct(
__serializer, #type_name, 1)); __serializer, #type_name, 1));
try!(_serde::ser::SerializeStruct::serialize_field( try!(_serde::ser::SerializeStruct::serialize_field(
&mut __struct, #tag, #variant_name)); &mut __struct, #tag, #variant_name));
_serde::ser::SerializeStruct::end(__struct) _serde::ser::SerializeStruct::end(__struct)
}; };
} }
let mut field_expr = quote!(__field0); let mut field_expr = quote!(__field0);
if let Some(path) = field.attrs.serialize_with() { if let Some(path) = field.attrs.serialize_with() {
test_suite/tests/test_ser.rs
+10 -3
View File
@@ -313,8 +313,13 @@ declare_tests! {
], ],
} }
test_enum { test_enum {
Enum::Unit => &[Token::UnitVariant { name: "Enum", variant: "Unit" }], Enum::Unit => &[
Enum::One(42) => &[Token::NewtypeVariant { name: "Enum", variant: "One" }, Token::I32(42)], Token::UnitVariant { name: "Enum", variant: "Unit" },
],
Enum::One(42) => &[
Token::NewtypeVariant { name: "Enum", variant: "One" },
Token::I32(42),
],
Enum::Seq(1, 2) => &[ Enum::Seq(1, 2) => &[
Token::TupleVariant { name: "Enum", variant: "Seq", len: 2 }, Token::TupleVariant { name: "Enum", variant: "Seq", len: 2 },
Token::I32(1), Token::I32(1),
@@ -330,7 +335,9 @@ declare_tests! {
Token::I32(2), Token::I32(2),
Token::StructVariantEnd, Token::StructVariantEnd,
], ],
Enum::OneWithSkipped(NotSerializable) => &[Token::UnitVariant {name: "Enum", variant: "OneWithSkipped" }], Enum::OneWithSkipped(NotSerializable) => &[
Token::UnitVariant { name: "Enum", variant: "OneWithSkipped" },
],
} }
test_box { test_box {
Box::new(0i32) => &[Token::I32(0)], Box::new(0i32) => &[Token::I32(0)],