From d6cb98b00b04e79e4d80e6fb4a210fa012409208 Mon Sep 17 00:00:00 2001
From: Austin Hellyer <hello@austinhellyer.me>
Date: Tue, 15 Nov 2016 20:43:45 -0800
Subject: Fix a few clippy lints

---
 src/ext/state/mod.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/ext')

diff --git a/src/ext/state/mod.rs b/src/ext/state/mod.rs
index 5c56a54..fad2a60 100644
--- a/src/ext/state/mod.rs
+++ b/src/ext/state/mod.rs
@@ -279,12 +279,12 @@ impl State {
             Channel::Group(ref group) => {
                 let ch = self.groups.insert(group.channel_id, group.clone());
 
-                ch.map(|x| Channel::Group(x))
+                ch.map(Channel::Group)
             },
             Channel::Private(ref channel) => {
                 let ch = self.private_channels.insert(channel.id, channel.clone());
 
-                ch.map(|x| Channel::Private(x))
+                ch.map(Channel::Private)
             },
             Channel::Public(ref channel) => {
                 let ch = self.guilds
@@ -298,7 +298,7 @@ impl State {
                     _ => None,
                 };
 
-                ch.map(|x| Channel::Public(x))
+                ch.map(Channel::Public)
             },
         }
     }
@@ -307,11 +307,11 @@ impl State {
         -> Option<Channel> {
         match event.channel {
             Channel::Group(ref group) => {
-                self.groups.remove(&group.channel_id).map(|x| Channel::Group(x))
+                self.groups.remove(&group.channel_id).map(Channel::Group)
             },
             Channel::Private(ref channel) => {
                 self.private_channels.remove(&channel.id)
-                    .map(|private| Channel::Private(private))
+                    .map(Channel::Private)
             },
             Channel::Public(ref channel) => {
                 let ch = self.guilds
@@ -666,9 +666,10 @@ impl State {
                                             event: &UserSettingsUpdateEvent,
                                             old: bool)
                                             -> Option<UserSettings> {
-        let item = match old {
-            true => self.settings.clone(),
-            false => None,
+        let item = if old {
+            self.settings.clone()
+        } else {
+            None
         };
 
         self.settings
-- 
cgit v1.2.3