Format with rustfmt 2019-03-27

This commit is contained in:
David Tolnay 2019-04-03 09:34:53 -07:00
parent 465392b618
commit 82bde8d166
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
5 changed files with 35 additions and 15 deletions

View File

@ -61,7 +61,12 @@ pub fn expand_derive_deserialize(input: &syn::DeriveInput) -> Result<TokenStream
}
};
Ok(dummy::wrap_in_const(cont.attrs.custom_serde_path(), "DESERIALIZE", ident, impl_block))
Ok(dummy::wrap_in_const(
cont.attrs.custom_serde_path(),
"DESERIALIZE",
ident,
impl_block,
))
}
fn precondition(cx: &Ctxt, cont: &Container) {

View File

@ -3,7 +3,12 @@ use proc_macro2::{Ident, Span, TokenStream};
use syn;
use try;
pub fn wrap_in_const(serde_path: Option<&syn::Path>, trait_: &str, ty: &Ident, code: TokenStream) -> TokenStream {
pub fn wrap_in_const(
serde_path: Option<&syn::Path>,
trait_: &str,
ty: &Ident,
code: TokenStream,
) -> TokenStream {
let try_replacement = try::replacement();
let dummy_const = Ident::new(
@ -11,16 +16,20 @@ pub fn wrap_in_const(serde_path: Option<&syn::Path>, trait_: &str, ty: &Ident, c
Span::call_site(),
);
let use_serde = serde_path.map(|path| {
quote!(use #path as _serde;)
}).unwrap_or_else(|| {
quote! {
#[allow(unknown_lints)]
#[cfg_attr(feature = "cargo-clippy", allow(useless_attribute))]
#[allow(rust_2018_idioms)]
extern crate serde as _serde;
}
});
let use_serde = serde_path
.map(|path| {
quote! {
use #path as _serde;
}
})
.unwrap_or_else(|| {
quote! {
#[allow(unknown_lints)]
#[cfg_attr(feature = "cargo-clippy", allow(useless_attribute))]
#[allow(rust_2018_idioms)]
extern crate serde as _serde;
}
});
quote! {
#[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]

View File

@ -52,7 +52,12 @@ pub fn expand_derive_serialize(input: &syn::DeriveInput) -> Result<TokenStream,
}
};
Ok(dummy::wrap_in_const(cont.attrs.custom_serde_path(), "SERIALIZE", ident, impl_block))
Ok(dummy::wrap_in_const(
cont.attrs.custom_serde_path(),
"SERIALIZE",
ident,
impl_block,
))
}
fn precondition(cx: &Ctxt, cont: &Container) {

View File

@ -265,7 +265,7 @@ fn test_gen() {
#[cfg(feature = "unstable")]
#[derive(Serialize, Deserialize)]
struct NonAsciiIdents {
σ: f64,
σ: f64,
}
#[derive(Serialize, Deserialize)]

View File

@ -19,7 +19,8 @@ mod fake_serde {
where
T: Serialize,
T: for<'a> Deserialize<'a>,
{}
{
}
pub trait Serialize {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error>;