Don't unnecessarily borrow some if-lets

3 files changed, 7 insertions, 7 deletions

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));
     }