Format with rustfmt 2018-12-10

serde/src/de/impls.rs

@@ -2272,7 +2272,7 @@ mod range {
 #[cfg(any(ops_bound, collections_bound))]
 impl<'de, T> Deserialize<'de> for Bound<T>
 where
-    T: Deserialize<'de>
+    T: Deserialize<'de>,
 {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where

serde/src/ser/impls.rs

@@ -267,8 +267,12 @@ where
     {
         match *self {
             Bound::Unbounded => serializer.serialize_unit_variant("Bound", 0, "Unbounded"),
-            Bound::Included(ref value) => serializer.serialize_newtype_variant("Bound", 1, "Included", value),
-            Bound::Excluded(ref value) => serializer.serialize_newtype_variant("Bound", 2, "Excluded", value),
+            Bound::Included(ref value) => {
+                serializer.serialize_newtype_variant("Bound", 1, "Included", value)
+            }
+            Bound::Excluded(ref value) => {
+                serializer.serialize_newtype_variant("Bound", 2, "Excluded", value)
+            }
         }
     }
 }

serde_derive/src/de.rs

@@ -1149,7 +1149,11 @@ fn prepare_enum_variant_enum(
         .enumerate()
         .filter(|&(_, variant)| !variant.attrs.skip_deserializing())
         .map(|(i, variant)| {
-            (variant.attrs.name().deserialize_name(), field_i(i), variant.attrs.aliases())
+            (
+                variant.attrs.name().deserialize_name(),
+                field_i(i),
+                variant.attrs.aliases(),
+            )
         })
         .collect();
 
@@ -2275,7 +2279,11 @@ fn deserialize_struct_as_struct_visitor(
         .enumerate()
         .filter(|&(_, field)| !field.attrs.skip_deserializing())
         .map(|(i, field)| {
-            (field.attrs.name().deserialize_name(), field_i(i), field.attrs.aliases())
+            (
+                field.attrs.name().deserialize_name(),
+                field_i(i),
+                field.attrs.aliases(),
+            )
         })
         .collect();
 
@@ -2304,7 +2312,11 @@ fn deserialize_struct_as_map_visitor(
         .enumerate()
         .filter(|&(_, field)| !field.attrs.skip_deserializing() && !field.attrs.flatten())
         .map(|(i, field)| {
-            (field.attrs.name().deserialize_name(), field_i(i), field.attrs.aliases())
+            (
+                field.attrs.name().deserialize_name(),
+                field_i(i),
+                field.attrs.aliases(),
+            )
         })
         .collect();
 
@@ -2537,7 +2549,11 @@ fn deserialize_struct_as_struct_in_place_visitor(
         .enumerate()
         .filter(|&(_, field)| !field.attrs.skip_deserializing())
         .map(|(i, field)| {
-            (field.attrs.name().deserialize_name(), field_i(i), field.attrs.aliases())
+            (
+                field.attrs.name().deserialize_name(),
+                field_i(i),
+                field.attrs.aliases(),
+            )
         })
         .collect();
 

serde_derive/src/internals/attr.rs

@@ -116,8 +116,10 @@ impl<'c, T> VecAttr<'c, T> {
     fn at_most_one(mut self) -> Result<Option<T>, ()> {
         if self.values.len() > 1 {
             let dup_token = self.first_dup_tokens;
-            self.cx
-                .error_spanned_by(dup_token, format!("duplicate serde attribute `{}`", self.name));
+            self.cx.error_spanned_by(
+                dup_token,
+                format!("duplicate serde attribute `{}`", self.name),
+            );
             Err(())
         } else {
             Ok(self.values.pop())

test_suite/tests/test_annotations.rs

@@ -574,7 +574,11 @@ fn test_rename_struct() {
     );
 
     assert_de_tokens(
-        &AliasStruct { a1: 1, a2: 2, a4: 3 },
+        &AliasStruct {
+            a1: 1,
+            a2: 2,
+            a4: 3,
+        },
         &[
             Token::Struct {
                 name: "AliasStruct",
@@ -591,7 +595,11 @@ fn test_rename_struct() {
     );
 
     assert_de_tokens(
-        &AliasStruct { a1: 1, a2: 2, a4: 3 },
+        &AliasStruct {
+            a1: 1,
+            a2: 2,
+            a4: 3,
+        },
         &[
             Token::Struct {
                 name: "AliasStruct",
@@ -665,7 +673,7 @@ enum AliasEnum {
         b: i8,
         #[serde(alias = "e", rename = "f")]
         d: i8,
-    }
+    },
 }
 
 #[test]
@@ -756,11 +764,7 @@ fn test_rename_enum() {
     );
 
     assert_de_tokens(
-        &AliasEnum::SailorMoon {
-            a: 0,
-            b: 1,
-            d: 2,
-        },
+        &AliasEnum::SailorMoon { a: 0, b: 1, d: 2 },
         &[
             Token::StructVariant {
                 name: "AliasEnum",
@@ -778,11 +782,7 @@ fn test_rename_enum() {
     );
 
     assert_de_tokens(
-        &AliasEnum::SailorMoon {
-            a: 0,
-            b: 1,
-            d: 2,
-        },
+        &AliasEnum::SailorMoon { a: 0, b: 1, d: 2 },
         &[
             Token::StructVariant {
                 name: "AliasEnum",
@@ -803,13 +803,11 @@ fn test_rename_enum() {
 #[test]
 fn test_unknown_field_rename_enum() {
     assert_de_tokens_error::<AliasEnum>(
-        &[
-            Token::StructVariant {
-                name: "AliasEnum",
-                variant: "SailorMoon",
-                len: 3,
-            },
-        ],
+        &[Token::StructVariant {
+            name: "AliasEnum",
+            variant: "SailorMoon",
+            len: 3,
+        }],
         "unknown variant `SailorMoon`, expected `sailor_moon`",
     );
 

test_suite/tests/test_de.rs

@@ -6,11 +6,11 @@ use std::default::Default;
 use std::ffi::{CStr, CString, OsString};
 use std::net;
 use std::num::Wrapping;
+use std::ops::Bound;
 use std::path::{Path, PathBuf};
 use std::rc::{Rc, Weak as RcWeak};
 use std::sync::{Arc, Weak as ArcWeak};
 use std::time::{Duration, UNIX_EPOCH};
-use std::ops::Bound;
 
 use fnv::FnvHasher;
 use serde::{Deserialize, Deserializer};

test_suite/tests/test_ser.rs

@@ -6,11 +6,11 @@ use std::ffi::CString;
 use std::mem;
 use std::net;
 use std::num::Wrapping;
+use std::ops::Bound;
 use std::path::{Path, PathBuf};
 use std::rc::{Rc, Weak as RcWeak};
 use std::sync::{Arc, Weak as ArcWeak};
 use std::time::{Duration, UNIX_EPOCH};
-use std::ops::Bound;
 
 #[cfg(unix)]
 use std::str;