From 53fe1b328e7c6fca9e0417f33e826003aed37c70 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 11 Sep 2018 23:00:08 -0700
Subject: [PATCH] Format with rustfmt 0.99.4

---
 serde_derive/src/de.rs               | 8 ++++----
 serde_derive/src/internals/check.rs  | 6 +++---
 test_suite/tests/test_annotations.rs | 6 ++----
 test_suite/tests/test_de.rs          | 2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/serde_derive/src/de.rs b/serde_derive/src/de.rs
index 69def6a6..de15af87 100644
--- a/serde_derive/src/de.rs
+++ b/serde_derive/src/de.rs
@@ -1172,7 +1172,7 @@ fn deserialize_externally_tagged_enum(
         &variant_names_idents,
         cattrs,
         true,
-        other_idx
+        other_idx,
     ));
 
     // Match arms to extract a variant from a string
@@ -1275,7 +1275,7 @@ fn deserialize_internally_tagged_enum(
         &variant_names_idents,
         cattrs,
         true,
-        other_idx
+        other_idx,
     ));
 
     // Match arms to extract a variant from a string
@@ -1349,7 +1349,7 @@ fn deserialize_adjacently_tagged_enum(
         &variant_names_idents,
         cattrs,
         true,
-        other_idx
+        other_idx,
     ));
 
     let variant_arms: &Vec<_> = &variants
@@ -1857,7 +1857,7 @@ fn deserialize_generated_identifier(
     fields: &[(String, Ident)],
     cattrs: &attr::Container,
     is_variant: bool,
-    other_idx: Option<usize>
+    other_idx: Option<usize>,
 ) -> Fragment {
     let this = quote!(__Field);
     let field_idents: &Vec<_> = &fields.iter().map(|&(_, ref ident)| ident).collect();
diff --git a/serde_derive/src/internals/check.rs b/serde_derive/src/internals/check.rs
index 54738f4e..01c4d103 100644
--- a/serde_derive/src/internals/check.rs
+++ b/serde_derive/src/internals/check.rs
@@ -111,12 +111,12 @@ fn check_identifier(cx: &Ctxt, cont: &Container) {
             variant.style,
             cont.attrs.identifier(),
             variant.attrs.other(),
-            cont.attrs.tag()
+            cont.attrs.tag(),
         ) {
             // The `other` attribute may not be used in a variant_identifier.
             (_, Identifier::Variant, true, _) => {
                 cx.error("#[serde(other)] may not be used on a variant_identifier");
-            },
+            }
 
             // Variant with `other` attribute cannot appear in untagged enum
             (_, Identifier::No, true, &EnumTag::None) => {
@@ -133,7 +133,7 @@ fn check_identifier(cx: &Ctxt, cont: &Container) {
             // Variant with `other` attribute must be a unit variant.
             (_, Identifier::Field, true, _) | (_, Identifier::No, true, _) => {
                 cx.error("#[serde(other)] must be on a unit variant");
-            },
+            }
 
             // Any sort of variant is allowed if this is not an identifier.
             (_, Identifier::No, false, _) => {}
diff --git a/test_suite/tests/test_annotations.rs b/test_suite/tests/test_annotations.rs
index bf8af805..bc077e11 100644
--- a/test_suite/tests/test_annotations.rs
+++ b/test_suite/tests/test_annotations.rs
@@ -12,7 +12,7 @@
 extern crate serde_derive;
 
 extern crate serde;
-use self::serde::de::{self, Visitor, MapAccess, Unexpected};
+use self::serde::de::{self, MapAccess, Unexpected, Visitor};
 use self::serde::{Deserialize, Deserializer, Serialize, Serializer};
 
 use std::collections::{BTreeMap, HashMap};
@@ -2360,9 +2360,7 @@ fn test_flatten_any_after_flatten_struct() {
     }
 
     let s = Outer {
-        inner: Inner {
-            inner: 0,
-        },
+        inner: Inner { inner: 0 },
         extra: Any,
     };
 
diff --git a/test_suite/tests/test_de.rs b/test_suite/tests/test_de.rs
index ef5ca3df..b7e2ef75 100644
--- a/test_suite/tests/test_de.rs
+++ b/test_suite/tests/test_de.rs
@@ -139,7 +139,7 @@ enum EnumSkipAll {
 enum EnumOther {
     Unit,
     #[serde(other)]
-    Other
+    Other,
 }
 
 //////////////////////////////////////////////////////////////////////////