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

Format with rustfmt 2018-12-10

Browse Source
This commit is contained in:
David Tolnay 2019-02-04 00:39:32 +01:00
parent 6a3a82007c
commit c473633676
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
serde_derive/src/ser.rs
View File

@ -289,10 +289,7 @@ fn serialize_struct(params: &Parameters, fields: &[Field], cattrs: &attr::Contai
} }
} }
fn serialize_struct_tag_field( fn serialize_struct_tag_field(cattrs: &attr::Container, struct_trait: &StructTrait) -> TokenStream {
cattrs: &attr::Container,
struct_trait: &StructTrait,
) -> TokenStream {
match *cattrs.tag() { match *cattrs.tag() {
attr::TagType::Internal { ref tag } => { attr::TagType::Internal { ref tag } => {
let type_name = cattrs.name().serialize_name(); let type_name = cattrs.name().serialize_name();
@ -301,7 +298,7 @@ fn serialize_struct_tag_field(
try!(#func(&mut __serde_state, #tag, #type_name)); try!(#func(&mut __serde_state, #tag, #type_name));
} }
} }
_ => quote!{} _ => quote! {},
} }
} }
@ -377,7 +374,7 @@ fn serialize_struct_as_map(
}) })
.fold( .fold(
quote!(#tag_field_exists as usize), quote!(#tag_field_exists as usize),
|sum, expr| quote!(#sum + #expr) |sum, expr| quote!(#sum + #expr),
); );
quote!(_serde::export::Some(#len)) quote!(_serde::export::Some(#len))
}; };

18
test_suite/tests/test_macros.rs
View File

@ -1427,20 +1427,20 @@ fn test_internally_tagged_braced_struct_with_zero_fields() {
#[test] #[test]
fn test_internally_tagged_struct_with_flattened_field() { fn test_internally_tagged_struct_with_flattened_field() {
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
#[serde(tag="tag_struct")] #[serde(tag = "tag_struct")]
pub struct Struct { pub struct Struct {
#[serde(flatten)] #[serde(flatten)]
pub flat: Enum pub flat: Enum,
} }
#[derive(Debug, PartialEq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
#[serde(tag="tag_enum", content="content")] #[serde(tag = "tag_enum", content = "content")]
pub enum Enum { pub enum Enum {
A(u64), A(u64),
} }
assert_tokens( assert_tokens(
&Struct{flat: Enum::A(0)}, &Struct { flat: Enum::A(0) },
&[ &[
Token::Map { len: None }, Token::Map { len: None },
Token::Str("tag_struct"), Token::Str("tag_struct"),
@ -1449,20 +1449,20 @@ fn test_internally_tagged_struct_with_flattened_field() {
Token::Str("A"), Token::Str("A"),
Token::Str("content"), Token::Str("content"),
Token::U64(0), Token::U64(0),
Token::MapEnd Token::MapEnd,
] ],
); );
assert_de_tokens( assert_de_tokens(
&Struct{flat: Enum::A(0)}, &Struct { flat: Enum::A(0) },
&[ &[
Token::Map { len: None }, Token::Map { len: None },
Token::Str("tag_enum"), Token::Str("tag_enum"),
Token::Str("A"), Token::Str("A"),
Token::Str("content"), Token::Str("content"),
Token::U64(0), Token::U64(0),
Token::MapEnd Token::MapEnd,
] ],
); );
} }