From 4fa2a50f62a4ccd342efdd6436f85dae59ebbac8 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sat, 19 May 2018 17:33:30 -0700 Subject: [PATCH] Format with rustfmt 0.7.0 --- serde/src/de/impls.rs | 3 ++- serde/src/private/de.rs | 18 ++++++++--------- serde/src/private/ser.rs | 3 ++- serde/src/ser/impls.rs | 3 ++- serde_derive/src/bound.rs | 6 ++++-- serde_derive/src/de.rs | 12 ++++++++---- serde_derive/src/internals/attr.rs | 4 +++- serde_derive/src/ser.rs | 3 ++- serde_test/src/de.rs | 3 ++- test_suite/tests/test_annotations.rs | 29 +++++++--------------------- 10 files changed, 41 insertions(+), 43 deletions(-) diff --git a/serde/src/de/impls.rs b/serde/src/de/impls.rs index 268fa045..a29c755c 100644 --- a/serde/src/de/impls.rs +++ b/serde/src/de/impls.rs @@ -1411,7 +1411,8 @@ impl<'de> Visitor<'de> for OsStringVisitor { use std::os::windows::ffi::OsStringExt; match try!(data.variant()) { - (OsStringKind::Windows, v) => v.newtype_variant::>() + (OsStringKind::Windows, v) => v + .newtype_variant::>() .map(|vec| OsString::from_wide(&vec)), (OsStringKind::Unix, _) => Err(Error::custom( "cannot deserialize Unix OS string on Windows", diff --git a/serde/src/private/de.rs b/serde/src/private/de.rs index de5b57b2..eb683ef9 100644 --- a/serde/src/private/de.rs +++ b/serde/src/private/de.rs @@ -2323,7 +2323,8 @@ mod content { T: de::DeserializeSeed<'de>, { match self.iter.next() { - Some(value) => seed.deserialize(ContentRefDeserializer::new(value)) + Some(value) => seed + .deserialize(ContentRefDeserializer::new(value)) .map(Some), None => Ok(None), } @@ -2821,14 +2822,13 @@ where // about. In case we do not know which fields we want, we take them all. let use_item = match *item { None => false, - Some((ref c, _)) => { - c.as_str() - .map_or(self.fields.is_none(), |key| match self.fields { - None => true, - Some(fields) if fields.contains(&key) => true, - _ => false, - }) - } + Some((ref c, _)) => c.as_str().map_or(self.fields.is_none(), |key| { + match self.fields { + None => true, + Some(fields) if fields.contains(&key) => true, + _ => false, + } + }), }; if use_item { diff --git a/serde/src/private/ser.rs b/serde/src/private/ser.rs index c21de163..d58c5409 100644 --- a/serde/src/private/ser.rs +++ b/serde/src/private/ser.rs @@ -947,7 +947,8 @@ mod content { where T: Serialize, { - let key = self.key + let key = self + .key .take() .expect("serialize_value called before serialize_key"); let value = try!(value.serialize(ContentSerializer::::new())); diff --git a/serde/src/ser/impls.rs b/serde/src/ser/impls.rs index 572806bf..aef7f735 100644 --- a/serde/src/ser/impls.rs +++ b/serde/src/ser/impls.rs @@ -535,7 +535,8 @@ impl Serialize for SystemTime { S: Serializer, { use super::SerializeStruct; - let duration_since_epoch = self.duration_since(UNIX_EPOCH) + let duration_since_epoch = self + .duration_since(UNIX_EPOCH) .expect("SystemTime must be later than UNIX_EPOCH"); let mut state = try!(serializer.serialize_struct("SystemTime", 2)); try!(state.serialize_field("secs_since_epoch", &duration_since_epoch.as_secs())); diff --git a/serde_derive/src/bound.rs b/serde_derive/src/bound.rs index e9efc22a..88061f3f 100644 --- a/serde_derive/src/bound.rs +++ b/serde_derive/src/bound.rs @@ -55,7 +55,8 @@ pub fn with_where_predicates_from_fields( generics: &syn::Generics, from_field: fn(&attr::Field) -> Option<&[syn::WherePredicate]>, ) -> syn::Generics { - let predicates = cont.data + let predicates = cont + .data .all_fields() .flat_map(|field| from_field(&field.attrs)) .flat_map(|predicates| predicates.to_vec()); @@ -284,7 +285,8 @@ fn type_of_item(cont: &Container) -> syn::Type { syn::AngleBracketedGenericArguments { colon2_token: None, lt_token: Default::default(), - args: cont.generics + args: cont + .generics .params .iter() .map(|param| match *param { diff --git a/serde_derive/src/de.rs b/serde_derive/src/de.rs index 3cce5f07..fd2328fb 100644 --- a/serde_derive/src/de.rs +++ b/serde_derive/src/de.rs @@ -203,7 +203,8 @@ fn build_generics(cont: &Container, borrowed: &BorrowedLifetimes) -> syn::Generi fn needs_deserialize_bound(field: &attr::Field, variant: Option<&attr::Variant>) -> bool { !field.skip_deserializing() && field.deserialize_with().is_none() && field.de_bound().is_none() && variant.map_or(true, |variant| { - !variant.skip_deserializing() && variant.deserialize_with().is_none() + !variant.skip_deserializing() + && variant.deserialize_with().is_none() && variant.de_bound().is_none() }) } @@ -304,7 +305,8 @@ fn deserialize_in_place_body(cont: &Container, params: &Parameters) -> Option bool { } fn is_primitive_path(path: &syn::Path, primitive: &str) -> bool { - path.leading_colon.is_none() && path.segments.len() == 1 && path.segments[0].ident == primitive + path.leading_colon.is_none() + && path.segments.len() == 1 + && path.segments[0].ident == primitive && path.segments[0].arguments.is_empty() } diff --git a/serde_derive/src/ser.rs b/serde_derive/src/ser.rs index 419ca624..71d247c0 100644 --- a/serde_derive/src/ser.rs +++ b/serde_derive/src/ser.rs @@ -160,7 +160,8 @@ fn build_generics(cont: &Container) -> syn::Generics { fn needs_serialize_bound(field: &attr::Field, variant: Option<&attr::Variant>) -> bool { !field.skip_serializing() && field.serialize_with().is_none() && field.ser_bound().is_none() && variant.map_or(true, |variant| { - !variant.skip_serializing() && variant.serialize_with().is_none() + !variant.skip_serializing() + && variant.serialize_with().is_none() && variant.ser_bound().is_none() }) } diff --git a/serde_test/src/de.rs b/serde_test/src/de.rs index 9b3e772a..0de17710 100644 --- a/serde_test/src/de.rs +++ b/serde_test/src/de.rs @@ -599,7 +599,8 @@ impl<'de, 'a> MapAccess<'de> for EnumMapVisitor<'a, 'de> { { match self.variant.take() { Some(Token::Str(variant)) => seed.deserialize(variant.into_deserializer()).map(Some), - Some(Token::Bytes(variant)) => seed.deserialize(BytesDeserializer { value: variant }) + Some(Token::Bytes(variant)) => seed + .deserialize(BytesDeserializer { value: variant }) .map(Some), Some(Token::U32(variant)) => seed.deserialize(variant.into_deserializer()).map(Some), Some(other) => unexpected!(other), diff --git a/test_suite/tests/test_annotations.rs b/test_suite/tests/test_annotations.rs index 7aaa97d5..5b82ad88 100644 --- a/test_suite/tests/test_annotations.rs +++ b/test_suite/tests/test_annotations.rs @@ -2074,15 +2074,11 @@ fn test_flatten_untagged_enum() { #[derive(Serialize, Deserialize, PartialEq, Debug)] #[serde(untagged)] enum Inner { - Variant { - a: i32, - }, + Variant { a: i32 }, } let data = Outer { - inner: Inner::Variant { - a: 0, - } + inner: Inner::Variant { a: 0 }, }; assert_tokens( @@ -2118,12 +2114,8 @@ fn test_flatten_option() { assert_tokens( &Outer { - inner1: Some(Inner1 { - inner1: 1, - }), - inner2: Some(Inner2 { - inner2: 2, - }), + inner1: Some(Inner1 { inner1: 1 }), + inner2: Some(Inner2 { inner2: 2 }), }, &[ Token::Map { len: None }, @@ -2137,9 +2129,7 @@ fn test_flatten_option() { assert_tokens( &Outer { - inner1: Some(Inner1 { - inner1: 1, - }), + inner1: Some(Inner1 { inner1: 1 }), inner2: None, }, &[ @@ -2153,9 +2143,7 @@ fn test_flatten_option() { assert_tokens( &Outer { inner1: None, - inner2: Some(Inner2 { - inner2: 2, - }), + inner2: Some(Inner2 { inner2: 2 }), }, &[ Token::Map { len: None }, @@ -2170,9 +2158,6 @@ fn test_flatten_option() { inner1: None, inner2: None, }, - &[ - Token::Map { len: None }, - Token::MapEnd, - ], + &[Token::Map { len: None }, Token::MapEnd], ); }