From 59f546d8d84d8dad76c1f159f1cd7ef4ccea00fb Mon Sep 17 00:00:00 2001
From: Austin Hellyer <hello@austinhellyer.me>
Date: Mon, 21 Nov 2016 19:28:26 -0800
Subject: Don't unnecessarily borrow some if-lets

---
 examples/07_voice.rs        | 2 +-
 src/client/context.rs       | 4 ++--
 src/client/gateway/shard.rs | 8 ++++----
 src/client/mod.rs           | 2 +-
 src/ext/voice/handler.rs    | 2 +-
 src/lib.rs                  | 2 +-
 src/model/mod.rs            | 1 +
 src/model/user.rs           | 4 ++--
 8 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/examples/07_voice.rs b/examples/07_voice.rs
index 3250512..e0dfd88 100644
--- a/examples/07_voice.rs
+++ b/examples/07_voice.rs
@@ -105,7 +105,7 @@ fn join(context: Context, message: Message, args: Vec<String>) {
     };
 
     let mut shard = context.shard.lock().unwrap();
-    let ref mut manager = shard.manager;
+    let mut manager = &mut shard.manager;
 
     let _handler = manager.join(Some(guild_id), connect_to);
 
diff --git a/src/client/context.rs b/src/client/context.rs
index 7008f9b..04f08e0 100644
--- a/src/client/context.rs
+++ b/src/client/context.rs
@@ -774,11 +774,11 @@ impl Context {
 
             let map = f(EditRole::new(role)).0.build();
 
-            return http::edit_role(guild_id.0, role_id.0, map);
+            http::edit_role(guild_id.0, role_id.0, map)
         } else {
             let map = f(EditRole::default()).0.build();
 
-            return http::edit_role(guild_id.0, role_id.0, map);
+            http::edit_role(guild_id.0, role_id.0, map)
         }}
     }
 
diff --git a/src/client/gateway/shard.rs b/src/client/gateway/shard.rs
index d85e341..4cafd21 100644
--- a/src/client/gateway/shard.rs
+++ b/src/client/gateway/shard.rs
@@ -363,14 +363,14 @@ impl Shard {
     }
 
     fn handle_dispatch(&mut self, event: &Event) {
-        if let &Event::Resumed(ref ev) = event {
+        if let Event::Resumed(ref ev) = *event {
             let status = GatewayStatus::ChangeInterval(ev.heartbeat_interval);
 
             let _ = self.keepalive_channel.send(status);
         }
 
         feature_voice_enabled! {{
-            if let &Event::VoiceStateUpdate(ref update) = event {
+            if let Event::VoiceStateUpdate(ref update) = *event {
                 if let Some(guild_id) = update.guild_id {
                     if let Some(handler) = self.manager.get(guild_id) {
                         handler.update_state(&update.voice_state);
@@ -378,7 +378,7 @@ impl Shard {
                 }
             }
 
-            if let &Event::VoiceServerUpdate(ref update) = event {
+            if let Event::VoiceServerUpdate(ref update) = *event {
                 if let Some(guild_id) = update.guild_id {
                     if let Some(handler) = self.manager.get(guild_id) {
                         handler.update_server(&update.endpoint, &update.token);
@@ -492,7 +492,7 @@ impl Shard {
                     .insert("status", status.name());
 
                 match game.as_ref() {
-                    Some(ref game) => {
+                    Some(game) => {
                         object.insert_object("game", move |o| o
                             .insert("name", &game.name))
                     },
diff --git a/src/client/mod.rs b/src/client/mod.rs
index fad01eb..d9c3ce2 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -1212,7 +1212,7 @@ pub fn validate_token(token: &str) -> Result<()> {
     }
 
     // Check that the second part is at least 6 characters long.
-    if parts.get(1).unwrap().len() < 6 {
+    if parts[1].len() < 6 {
         return Err(Error::Client(ClientError::InvalidToken));
     }
 
diff --git a/src/ext/voice/handler.rs b/src/ext/voice/handler.rs
index 1f2a5d2..cbdd033 100644
--- a/src/ext/voice/handler.rs
+++ b/src/ext/voice/handler.rs
@@ -282,7 +282,7 @@ impl Handler {
     /// You probably shouldn't use this if you're reading the source code.
     #[doc(hidden)]
     pub fn update_server(&mut self, endpoint: &Option<String>, token: &str) {
-        if let &Some(ref endpoint) = endpoint {
+        if let Some(ref endpoint) = *endpoint {
             let endpoint = endpoint.clone();
             let token = token.to_owned();
             let session_id = match self.session_id {
diff --git a/src/lib.rs b/src/lib.rs
index c67a201..4daa8d9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -74,7 +74,7 @@
 //! [docs]: https://discordapp.com/developers/docs/intro
 //! [examples]: https://github.com/zeyla/serenity.rs/tree/master/examples
 //! [state docs]: ext/state/index.html
-#![allow(inline_always, unknown_lints)]
+#![allow(doc_markdown, inline_always, unknown_lints)]
 #![warn(dead_code, enum_glob_use, if_not_else)]
 
 #[macro_use]
diff --git a/src/model/mod.rs b/src/model/mod.rs
index 20dfabb..26041a9 100644
--- a/src/model/mod.rs
+++ b/src/model/mod.rs
@@ -58,6 +58,7 @@ macro_rules! id {
         $(
             #[$attr]
             #[derive(Copy, Clone, Debug, Eq, Hash, PartialOrd, Ord)]
+            #[allow(derive_hash_xor_eq)]
             pub struct $name(pub u64);
 
             impl $name {
diff --git a/src/model/user.rs b/src/model/user.rs
index 68c46ec..412d1ae 100644
--- a/src/model/user.rs
+++ b/src/model/user.rs
@@ -127,9 +127,9 @@ impl User {
                 feature_state! {{
                     let state = STATE.lock().unwrap();
 
-                    return state.get_role(guild_id, role_id).is_some();
+                    state.get_role(guild_id, role_id).is_some()
                 } else {
-                    return true;
+                    true
                 }}
             },
         }
-- 
cgit v1.2.3