itsscb/serde
1
0
Fork 0
mirror of https://github.com/serde-rs/serde.git synced 2025-10-02 07:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some rustfmt screwups

Browse Source
This commit is contained in:
David Tolnay 2017-04-19 15:56:22 -07:00
parent 4a9cb3395d
commit cf1cdadc77
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
2 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
serde_derive/src/de.rs
View File

@ -52,15 +52,14 @@ pub fn expand_derive_deserialize(input: &syn::DeriveInput) -> Result<Tokens, Str
} }
}; };
Ok( let generated = quote! {
quote! {
#[allow(non_upper_case_globals, unused_attributes, unused_qualifications)] #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
const #dummy_const: () = { const #dummy_const: () = {
extern crate serde as _serde; extern crate serde as _serde;
#impl_block #impl_block
}; };
}, };
) Ok(generated)
} }
struct Parameters { struct Parameters {
@ -629,8 +628,8 @@ fn deserialize_externally_tagged_enum(
let block = Match(deserialize_externally_tagged_variant(params, variant, cattrs),); let block = Match(deserialize_externally_tagged_variant(params, variant, cattrs),);
quote! { quote! {
(__Field::#variant_name, __variant) => #block (__Field::#variant_name, __variant) => #block
} }
}, },
); );
@ -788,8 +787,8 @@ fn deserialize_adjacently_tagged_enum(
); );
quote! { quote! {
__Field::#variant_index => #block __Field::#variant_index => #block
} }
}, },
) )
.collect(); .collect();
@ -820,8 +819,8 @@ fn deserialize_adjacently_tagged_enum(
} else { } else {
Some( Some(
quote! { quote! {
_ => #missing_content _ => #missing_content
}, },
) )
}; };
let arms = variants let arms = variants
@ -833,8 +832,8 @@ fn deserialize_adjacently_tagged_enum(
let variant_index = field_i(i); let variant_index = field_i(i);
let variant_ident = &variant.ident; let variant_ident = &variant.ident;
quote! { quote! {
__Field::#variant_index => _serde::export::Ok(#this::#variant_ident), __Field::#variant_index => _serde::export::Ok(#this::#variant_ident),
} }
}, },
); );
missing_content = quote! { missing_content = quote! {
@ -1465,8 +1464,8 @@ fn deserialize_map(
|&(field, ref name)| { |&(field, ref name)| {
let field_ty = &field.ty; let field_ty = &field.ty;
quote! { quote! {
let mut #name: _serde::export::Option<#field_ty> = _serde::export::None; let mut #name: _serde::export::Option<#field_ty> = _serde::export::None;
} }
}, },
); );
@ -1541,11 +1540,11 @@ fn deserialize_map(
let missing_expr = Match(expr_is_missing(&field, cattrs)); let missing_expr = Match(expr_is_missing(&field, cattrs));
quote! { quote! {
let #name = match #name { let #name = match #name {
_serde::export::Some(#name) => #name, _serde::export::Some(#name) => #name,
_serde::export::None => #missing_expr _serde::export::None => #missing_expr
}; };
} }
}, },
); );

31
serde_derive/src/ser.rs
View File

@ -51,15 +51,14 @@ pub fn expand_derive_serialize(input: &syn::DeriveInput) -> Result<Tokens, Strin
} }
}; };
Ok( let generated = quote! {
quote! {
#[allow(non_upper_case_globals, unused_attributes, unused_qualifications)] #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
const #dummy_const: () = { const #dummy_const: () = {
extern crate serde as _serde; extern crate serde as _serde;
#impl_block #impl_block
}; };
}, };
) Ok(generated)
} }
fn precondition(cx: &Ctxt, cont: &Container) { fn precondition(cx: &Ctxt, cont: &Container) {
@ -518,12 +517,12 @@ fn serialize_adjacently_tagged_variant(
match variant.style { match variant.style {
Style::Unit => { Style::Unit => {
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)
}; };
} }
Style::Newtype => { Style::Newtype => {
let field = &variant.fields[0]; let field = &variant.fields[0];
@ -533,8 +532,8 @@ fn serialize_adjacently_tagged_variant(
} }
quote_expr! { quote_expr! {
_serde::Serialize::serialize(#field_expr, __serializer) _serde::Serialize::serialize(#field_expr, __serializer)
} }
} }
Style::Tuple => { Style::Tuple => {
serialize_tuple_variant(TupleVariant::Untagged, params, &variant.fields) serialize_tuple_variant(TupleVariant::Untagged, params, &variant.fields)
@ -812,8 +811,8 @@ fn serialize_tuple_struct_visitor(
} }
let ser = quote! { let ser = quote! {
try!(#func(&mut __serde_state, #field_expr)); try!(#func(&mut __serde_state, #field_expr));
}; };
match skip { match skip {
None => ser, None => ser,
@ -854,8 +853,8 @@ fn serialize_struct_visitor(
} }
let ser = quote! { let ser = quote! {
try!(#func(&mut __serde_state, #key_expr, #field_expr)); try!(#func(&mut __serde_state, #key_expr, #field_expr));
}; };
match skip { match skip {
None => ser, None => ser,