From 87040b4bc4708f182bf6b0096999662e7c34bedc Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Wed, 25 Jan 2017 20:42:44 -0800
Subject: [PATCH] Fix clippy lints in serde_test

---
 serde_test/src/de.rs | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/serde_test/src/de.rs b/serde_test/src/de.rs
index cb41ab15..8bdfdcee 100644
--- a/serde_test/src/de.rs
+++ b/serde_test/src/de.rs
@@ -273,7 +273,7 @@ impl<'a, I> de::Deserializer for &'a mut Deserializer<I>
         where V: Visitor,
     {
         match self.tokens.peek() {
-            Some(&Token::Option(false)) => {
+            Some(&Token::Unit) | Some(&Token::Option(false)) => {
                 self.tokens.next();
                 visitor.visit_none()
             }
@@ -281,10 +281,6 @@ impl<'a, I> de::Deserializer for &'a mut Deserializer<I>
                 self.tokens.next();
                 visitor.visit_some(self)
             }
-            Some(&Token::Unit) => {
-                self.tokens.next();
-                visitor.visit_none()
-            }
             Some(_) => visitor.visit_some(self),
             None => Err(Error::EndOfTokens),
         }
@@ -316,7 +312,7 @@ impl<'a, I> de::Deserializer for &'a mut Deserializer<I>
                 let token = self.tokens.next().unwrap();
                 Err(Error::UnexpectedToken(token))
             }
-            None => { return Err(Error::EndOfTokens); }
+            None => Err(Error::EndOfTokens),
         }
     }
 
@@ -377,11 +373,7 @@ impl<'a, I> de::Deserializer for &'a mut Deserializer<I>
         where V: Visitor,
     {
         match self.tokens.peek() {
-            Some(&Token::Unit) => {
-                self.tokens.next();
-                visitor.visit_unit()
-            }
-            Some(&Token::UnitStruct(_)) => {
+            Some(&Token::Unit) | Some(&Token::UnitStruct(_)) => {
                 self.tokens.next();
                 visitor.visit_unit()
             }