Fix most clippy warnings

9 files changed, 20 insertions, 32 deletions

diff --git a/src/client/bridge/gateway/shard_manager.rs b/src/client/bridge/gateway/shard_manager.rs
index 3bdf0f9..5dbe0c3 100644
--- a/src/client/bridge/gateway/shard_manager.rs
+++ b/src/client/bridge/gateway/shard_manager.rs
@@ -127,12 +127,7 @@ impl ShardManager {
     }
 
     pub fn run(&mut self) {
-        loop {
-            let value = match self.thread_rx.recv() {
-                Ok(value) => value,
-                Err(_) => break,
-            };
-
+        while let Ok(value) = self.thread_rx.recv() {
             match value {
                 ShardManagerMessage::Restart(shard_id) => self.restart(shard_id),
                 ShardManagerMessage::Shutdown(shard_id) => self.shutdown(shard_id),
diff --git a/src/client/bridge/gateway/shard_queuer.rs b/src/client/bridge/gateway/shard_queuer.rs
index 76e3872..f35acb7 100644
--- a/src/client/bridge/gateway/shard_queuer.rs
+++ b/src/client/bridge/gateway/shard_queuer.rs
@@ -40,14 +40,7 @@ pub struct ShardQueuer<H: EventHandler + Send + Sync + 'static> {
 
 impl<H: EventHandler + Send + Sync + 'static> ShardQueuer<H> {
     pub fn run(&mut self) {
-        loop {
-            let msg = match self.rx.recv() {
-                Ok(msg) => msg,
-                Err(_) => {
-                    break;
-                }
-            };
-
+        while let Ok(msg) = self.rx.recv() {
             match msg {
                 ShardQueuerMessage::Shutdown => break,
                 ShardQueuerMessage::Start(shard_id, shard_total) => {
diff --git a/src/framework/standard/args.rs b/src/framework/standard/args.rs
index 8f166b6..30264b3 100644
--- a/src/framework/standard/args.rs
+++ b/src/framework/standard/args.rs
@@ -140,7 +140,7 @@ impl Args {
     /// [`single_quoted`]: #method.single_quoted
     pub fn single_quoted_n<T: FromStr>(&self) -> Result<T, T::Err>
         where T::Err: StdError {
-        Ok(parse_quotes(&self.delimiter_split.get(0).ok_or(Error::Eos)?)
+        Ok(parse_quotes(self.delimiter_split.get(0).ok_or(Error::Eos)?)
             .remove(0)
             .parse::<T>()?)
     }
@@ -156,7 +156,7 @@ impl Args {
 
         parse_quotes(&self.delimiter_split.join(&self.delimiter))
             .into_iter()
-            .map(|s| s.parse::<T>().map_err(|e| Error::Parse(e)))
+            .map(|s| s.parse::<T>().map_err(Error::Parse))
             .collect()
     }
 
@@ -169,7 +169,7 @@ impl Args {
 
         self.delimiter_split
             .into_iter()
-            .map(|s| s.parse::<T>().map_err(|e| Error::Parse(e)))
+            .map(|s| s.parse::<T>().map_err(Error::Parse))
             .collect()
     }
 
diff --git a/src/framework/standard/create_group.rs b/src/framework/standard/create_group.rs
index 8f6d5ac..39fbcc6 100644
--- a/src/framework/standard/create_group.rs
+++ b/src/framework/standard/create_group.rs
@@ -36,7 +36,7 @@ impl CreateGroup {
             .owners_only(self.0.owners_only);
 
         if let Some(ref bucket) = self.0.bucket {
-            cmd = cmd.bucket(&bucket);
+            cmd = cmd.bucket(bucket);
         }
         cmd.0.allowed_roles = self.0.allowed_roles.clone();
         cmd
diff --git a/src/framework/standard/help_commands.rs b/src/framework/standard/help_commands.rs
index f92e3cc..42527d0 100644
--- a/src/framework/standard/help_commands.rs
+++ b/src/framework/standard/help_commands.rs
@@ -51,13 +51,13 @@ fn remove_aliases(cmds: &HashMap<String, CommandOrAlias>) -> HashMap<&String, &I
 }
 
 fn right_roles(cmd: &Command, guild: &Guild, member: &Member) -> bool {
-    if !cmd.allowed_roles.is_empty() {
+    if cmd.allowed_roles.is_empty() {
+        true
+    } else {
         cmd.allowed_roles
             .iter()
-            .flat_map(|r| guild.role_by_name(&r))
+            .flat_map(|r| guild.role_by_name(r))
             .any(|g| member.roles.contains(&g.id))
-    } else {
-        true
     }
 }
 
@@ -100,13 +100,13 @@ pub fn with_embeds(_: &mut Context,
                 if name == with_prefix || name == *command_name {
                     match *command {
                         CommandOrAlias::Command(ref cmd) => {
-                            if cmd.allowed_roles.len() > 0 {
+                            if !cmd.allowed_roles.is_empty() {
                                 if let Some(guild) = msg.guild() {
                                     let guild = guild.read().unwrap();
                                     if let Some(member) = guild.members.get(&msg.author.id) {
                                         if let Ok(permissions) = member.permissions() {
                                             if !permissions.administrator() &&
-                                               !right_roles(&cmd, &guild, &member) {
+                                               !right_roles(cmd, &guild, member) {
                                                 break;
                                             }
                                         }
@@ -213,7 +213,7 @@ pub fn with_embeds(_: &mut Context,
                             if let Some(member) = guild.members.get(&msg.author.id) {
                                 if let Ok(permissions) = member.permissions() {
                                     if cmd.help_available &&
-                                       (right_roles(&cmd, &guild, &member) ||
+                                       (right_roles(cmd, &guild, member) ||
                                         permissions.administrator()) {
                                         let _ = write!(desc, "`{}`\n", name);
                                         has_commands = true;
@@ -273,13 +273,13 @@ pub fn plain(_: &mut Context,
                 if name == with_prefix || name == *command_name {
                     match *command {
                         CommandOrAlias::Command(ref cmd) => {
-                            if cmd.allowed_roles.len() > 0 {
+                            if !cmd.allowed_roles.is_empty() {
                                 if let Some(guild) = msg.guild() {
                                     let guild = guild.read().unwrap();
                                     if let Some(member) = guild.members.get(&msg.author.id) {
                                         if let Ok(permissions) = member.permissions() {
                                             if !permissions.administrator() &&
-                                               !right_roles(&cmd, &guild, &member) {
+                                               !right_roles(cmd, &guild, member) {
                                                 break;
                                             }
                                         }
@@ -366,7 +366,7 @@ pub fn plain(_: &mut Context,
                 if let Some(member) = guild.members.get(&msg.author.id) {
                     if let Ok(permissions) = member.permissions() {
                         if cmd.help_available &&
-                           (permissions.administrator() || right_roles(&cmd, &guild, &member)) {
+                           (permissions.administrator() || right_roles(cmd, &guild, member)) {
                             let _ = write!(group_help, "`{}` ", name);
                         }
                     }
diff --git a/src/framework/standard/mod.rs b/src/framework/standard/mod.rs
index e735100..a441856 100644
--- a/src/framework/standard/mod.rs
+++ b/src/framework/standard/mod.rs
@@ -531,7 +531,7 @@ impl StandardFramework {
                                     let right_role = command
                                         .allowed_roles
                                         .iter()
-                                        .flat_map(|r| guild.role_by_name(&r))
+                                        .flat_map(|r| guild.role_by_name(r))
                                         .any(|g| member.roles.contains(&g.id));
                                     if !right_role {
                                         return Some(DispatchError::LackingRole);
diff --git a/src/http/ratelimiting.rs b/src/http/ratelimiting.rs
index a0023f6..ed3eb71 100644
--- a/src/http/ratelimiting.rs
+++ b/src/http/ratelimiting.rs
@@ -510,7 +510,7 @@ fn parse_header(headers: &Headers, header: &str) -> Result<Option<i64>> {
             .map_err(|_| Error::Http(HttpError::RateLimitUtf8))
             .and_then(|v| {
                 v.parse::<i64>()
-                    .map(|v| Some(v))
+                    .map(Some)
                     .map_err(|_| Error::Http(HttpError::RateLimitI64))
             })
     })
diff --git a/src/model/channel/mod.rs b/src/model/channel/mod.rs
index f46a486..4ba0322 100644
--- a/src/model/channel/mod.rs
+++ b/src/model/channel/mod.rs
@@ -92,7 +92,7 @@ impl Channel {
                 let _ = private_channel.read().unwrap().delete()?;
             },
             Channel::Category(ref category) => {
-                let _ = category.read().unwrap().delete()?;
+                category.read().unwrap().delete()?;
             },
         }
 
diff --git a/src/model/event.rs b/src/model/event.rs
index f729a33..7278bbb 100644
--- a/src/model/event.rs
+++ b/src/model/event.rs
@@ -96,7 +96,7 @@ impl CacheUpdate for ChannelCreateEvent {
 
                 let id = channel.with_mut(|writer| {
                     let user_id = writer.recipient.with_mut(|user| {
-                        cache.update_user_entry(&user);
+                        cache.update_user_entry(user);
 
                         user.id
                     });