Fix some clippy lints

Some lints were not resolved due to causing API changes. Most lints in the
framework were left unfixed.

18 files changed, 98 insertions, 100 deletions

diff --git a/src/builder/create_embed.rs b/src/builder/create_embed.rs
index 52ed7cb..7604386 100644
--- a/src/builder/create_embed.rs
+++ b/src/builder/create_embed.rs
@@ -127,10 +127,10 @@ impl CreateEmbed {
     #[inline]
     pub fn field<T, U>(self, name: T, value: U, inline: bool) -> Self
         where T: Display, U: Display {
-        self._field(name.to_string(), value.to_string(), inline)
+        self._field(&name.to_string(), &value.to_string(), inline)
     }
 
-    fn _field(mut self, name: String, value: String, inline: bool) -> Self {
+    fn _field(mut self, name: &str, value: &str, inline: bool) -> Self {
         {
             let entry = self.0
                 .entry("fields")
diff --git a/src/builder/edit_message.rs b/src/builder/edit_message.rs
index c62f072..b796804 100644
--- a/src/builder/edit_message.rs
+++ b/src/builder/edit_message.rs
@@ -32,7 +32,7 @@ impl EditMessage {
     }
 
     fn _content(mut self, content: String) -> Self {
-        self.0.insert("content", Value::String(content.to_string()));
+        self.0.insert("content", Value::String(content));
 
         self
     }
diff --git a/src/client/bridge/gateway/shard_manager.rs b/src/client/bridge/gateway/shard_manager.rs
index 3bf587c..62629b1 100644
--- a/src/client/bridge/gateway/shard_manager.rs
+++ b/src/client/bridge/gateway/shard_manager.rs
@@ -128,8 +128,8 @@ pub struct ShardManager {
 impl ShardManager {
     /// Creates a new shard manager, returning both the manager and a monitor
     /// for usage in a separate thread.
-    pub fn new<'a, H>(
-        opt: ShardManagerOptions<'a, H>,
+    pub fn new<H>(
+        opt: ShardManagerOptions<H>,
     ) -> (Arc<Mutex<Self>>, ShardManagerMonitor) where H: EventHandler + Send + Sync + 'static {
         let (thread_tx, thread_rx) = mpsc::channel();
         let (shard_queue_tx, shard_queue_rx) = mpsc::channel();
diff --git a/src/client/bridge/gateway/shard_manager_monitor.rs b/src/client/bridge/gateway/shard_manager_monitor.rs
index 16cc001..e9a07cd 100644
--- a/src/client/bridge/gateway/shard_manager_monitor.rs
+++ b/src/client/bridge/gateway/shard_manager_monitor.rs
@@ -46,10 +46,10 @@ impl ShardManagerMonitor {
                     let manager = self.manager.lock();
                     let mut runners = manager.runners.lock();
 
-                    runners.get_mut(&id).map(|runner| {
+                    if let Some(runner) = runners.get_mut(&id) {
                         runner.latency = latency;
                         runner.stage = stage;
-                    });
+                    }
                 }
                 ShardManagerMessage::Shutdown(shard_id) => {
                     self.manager.lock().shutdown(shard_id);
diff --git a/src/framework/standard/create_help_command.rs b/src/framework/standard/create_help_command.rs
index 12a0b55..b1fd8ec 100644
--- a/src/framework/standard/create_help_command.rs
+++ b/src/framework/standard/create_help_command.rs
@@ -264,8 +264,7 @@ impl CreateHelpCommand {
     /// If `Some(String)` was set as `striked_commands_tip` and the `String` is empty,
     /// the creator will substitute content based on the `HelpBehaviour`-settings.
     pub(crate) fn finish(mut self) -> Arc<Help> {
-
-        if &self.0.striked_commands_tip_in_dm == &Some(String::new()) {
+        if self.0.striked_commands_tip_in_dm == Some(String::new()) {
             self.0.striked_commands_tip_in_dm = self.produce_strike_text("direct messages");
         }
 
diff --git a/src/framework/standard/help_commands.rs b/src/framework/standard/help_commands.rs
index a088ef1..d951222 100644
--- a/src/framework/standard/help_commands.rs
+++ b/src/framework/standard/help_commands.rs
@@ -48,7 +48,7 @@ use super::{
 };
 use utils::Colour;
 
-fn error_embed(channel_id: &ChannelId, input: &str, colour: Colour) {
+fn error_embed(channel_id: ChannelId, input: &str, colour: Colour) {
     let _ = channel_id.send_message(|m| {
         m.embed(|e| e.colour(colour).description(input))
     });
@@ -123,7 +123,7 @@ pub fn is_command_visible(command_options: &Arc<CommandOptions>, msg: &Message,
         return help_options.wrong_channel != HelpBehaviour::Hide;
     }
 
-    return false
+    false
 }
 
 /// Posts an embed showing each individual command group and its commands.
@@ -199,7 +199,7 @@ pub fn with_embeds<H: BuildHasher>(
             if let Some((command_name, command)) = found {
                 let command = command.options();
                 if !command.help_available {
-                    error_embed(&msg.channel_id, &help_options.no_help_available_text, help_options.embed_error_colour);
+                    error_embed(msg.channel_id, &help_options.no_help_available_text, help_options.embed_error_colour);
 
                     return Ok(());
                 }
@@ -253,7 +253,7 @@ pub fn with_embeds<H: BuildHasher>(
         }
 
         let error_msg = help_options.command_not_found_text.replace("{}", name);
-        error_embed(&msg.channel_id, &error_msg, help_options.embed_error_colour);
+        error_embed(msg.channel_id, &error_msg, help_options.embed_error_colour);
 
         return Ok(());
     }
@@ -284,7 +284,7 @@ pub fn with_embeds<H: BuildHasher>(
                 let mut desc = String::new();
 
                 if let Some(ref prefixes) = group.prefixes {
-                    let _ = write!(desc, "{}: `{}`\n", &help_options.group_prefix, prefixes.join("`, `"));
+                    let _ = writeln!(desc, "{}: `{}`", &help_options.group_prefix, prefixes.join("`, `"));
                 }
 
                 let mut has_commands = false;
@@ -307,17 +307,17 @@ pub fn with_embeds<H: BuildHasher>(
                                 if let Some(member) = guild.members.get(&msg.author.id) {
 
                                     if has_correct_roles(&cmd, &guild, &member) {
-                                        let _ = write!(desc, "`{}`\n", name);
+                                        let _ = writeln!(desc, "`{}`", name);
                                         has_commands = true;
                                     } else {
                                         match help_options.lacking_role {
                                             HelpBehaviour::Strike => {
                                                 let name = format!("~~`{}`~~", &name);
-                                                let _ = write!(desc, "{}\n", name);
+                                                let _ = writeln!(desc, "{}", name);
                                                 has_commands = true;
                                             },
                                                 HelpBehaviour::Nothing => {
-                                                let _ = write!(desc, "`{}`\n", name);
+                                                let _ = writeln!(desc, "`{}`", name);
                                                 has_commands = true;
                                             },
                                                 HelpBehaviour::Hide => {
@@ -327,18 +327,18 @@ pub fn with_embeds<H: BuildHasher>(
                                     }
                                 }
                             } else {
-                                let _ = write!(desc, "`{}`\n", name);
+                                let _ = writeln!(desc, "`{}`", name);
                                 has_commands = true;
                             }
                         } else {
                             match help_options.lacking_permissions {
                                 HelpBehaviour::Strike => {
                                     let name = format!("~~`{}`~~", &name);
-                                    let _ = write!(desc, "{}\n", name);
+                                    let _ = writeln!(desc, "{}", name);
                                     has_commands = true;
                                 },
                                 HelpBehaviour::Nothing => {
-                                    let _ = write!(desc, "`{}`\n", name);
+                                    let _ = writeln!(desc, "`{}`", name);
                                     has_commands = true;
                                 },
                                 HelpBehaviour::Hide => {
@@ -350,11 +350,11 @@ pub fn with_embeds<H: BuildHasher>(
                         match help_options.wrong_channel {
                             HelpBehaviour::Strike => {
                                 let name = format!("~~`{}`~~", &name);
-                                let _ = write!(desc, "{}\n", name);
+                                let _ = writeln!(desc, "{}", name);
                                 has_commands = true;
                             },
                             HelpBehaviour::Nothing => {
-                                let _ = write!(desc, "`{}`\n", name);
+                                let _ = writeln!(desc, "`{}`", name);
                                 has_commands = true;
                             },
                             HelpBehaviour::Hide => {
@@ -459,23 +459,23 @@ pub fn plain<H: BuildHasher>(
 
                 if !command.aliases.is_empty() {
                     let aliases = command.aliases.join("`, `");
-                    let _ = write!(result, "**{}:** `{}`\n", help_options.aliases_label, aliases);
+                    let _ = writeln!(result, "**{}:** `{}`", help_options.aliases_label, aliases);
                 }
 
                 if let Some(ref desc) = command.desc {
-                    let _ = write!(result, "**{}:** {}\n", help_options.description_label, desc);
+                    let _ = writeln!(result, "**{}:** {}", help_options.description_label, desc);
                 }
 
                 if let Some(ref usage) = command.usage {
-                    let _ = write!(result, "**{}:** `{} {}`\n", help_options.usage_label, command_name, usage);
+                    let _ = writeln!(result, "**{}:** `{} {}`", help_options.usage_label, command_name, usage);
                 }
 
                 if let Some(ref example) = command.example {
-                    let _ = write!(result, "**{}:** `{} {}`\n", help_options.usage_sample_label, command_name, example);
+                    let _ = writeln!(result, "**{}:** `{} {}`", help_options.usage_sample_label, command_name, example);
                 }
 
                 if group_name != "Ungrouped" {
-                    let _ = write!(result, "**{}:** {}\n", help_options.grouped_label, group_name);
+                    let _ = writeln!(result, "**{}:** {}", help_options.grouped_label, group_name);
                 }
 
                 let only = if command.dm_only {
@@ -511,9 +511,9 @@ pub fn plain<H: BuildHasher>(
     };
 
     if let Some(ref striked_command_text) = striked_command_tip {
-        let _ = write!(result, "{}\n{}\n\n", &help_options.individual_command_tip, striked_command_text);
+        let _ = writeln!(result, "{}\n{}\n", &help_options.individual_command_tip, striked_command_text);
     } else {
-        let _ = write!(result, "{}\n\n", &help_options.individual_command_tip);
+        let _ = writeln!(result, "{}\n", &help_options.individual_command_tip);
     }
 
     let mut group_names = groups.keys().collect::<Vec<_>>();
diff --git a/src/framework/standard/mod.rs b/src/framework/standard/mod.rs
index 42da699..1d7158a 100644
--- a/src/framework/standard/mod.rs
+++ b/src/framework/standard/mod.rs
@@ -529,14 +529,12 @@ impl StandardFramework {
                     // Is there a custom check for when this bucket applies?
                     // If not, assert that it does always.
                     let apply = bucket.check.as_ref().map_or(true, |check| {
-                        let apply = feature_cache! {{
+                        feature_cache! {{
                             let guild_id = message.guild_id;
                             (check)(context, guild_id, message.channel_id, message.author.id)
                         } else {
                             (check)(context, message.channel_id, message.author.id)
-                        }};
-
-                        apply
+                        }}
                     });
 
                     if apply && rate_limit > 0i64 {
@@ -955,9 +953,9 @@ impl StandardFramework {
     /// to alter help-commands.
     pub fn customised_help<F>(mut self, f: HelpFunction, c: F) -> Self
         where F: FnOnce(CreateHelpCommand) -> CreateHelpCommand {
-        let a = c(CreateHelpCommand(HelpOptions::default(), f));
+        let res = c(CreateHelpCommand(HelpOptions::default(), f));
 
-        self.help = Some(a.finish());
+        self.help = Some(res.finish());
 
         self
     }
diff --git a/src/http/mod.rs b/src/http/mod.rs
index 61501bf..71c57c6 100644
--- a/src/http/mod.rs
+++ b/src/http/mod.rs
@@ -193,7 +193,7 @@ pub fn ban_user(guild_id: u64, user_id: u64, delete_message_days: u8, reason: &s
 /// [`Guild`]: ../model/guild/struct.Guild.html
 /// [Ban Members]: ../model/permissions/constant.BAN_MEMBERS.html
 pub fn ban_zeyla(guild_id: u64, delete_message_days: u8, reason: &str) -> Result<()> {
-    ban_user(guild_id, 114941315417899012, delete_message_days, reason)
+    ban_user(guild_id, 114_941_315_417_899_012, delete_message_days, reason)
 }
 
 /// Ban luna from a [`Guild`], removing her messages sent in the last X number
@@ -207,7 +207,7 @@ pub fn ban_zeyla(guild_id: u64, delete_message_days: u8, reason: &str) -> Result
 /// [`Guild`]: ../model/guild/struct.Guild.html
 /// [Ban Members]: ../model/permissions/constant.BAN_MEMBERS.html
 pub fn ban_luna(guild_id: u64, delete_message_days: u8, reason: &str) -> Result<()> {
-    ban_user(guild_id, 180731582049550336, delete_message_days, reason)
+    ban_user(guild_id, 180_731_582_049_550_336, delete_message_days, reason)
 }
 
 /// Ban the serenity servermoms from a [`Guild`], removing their messages
diff --git a/src/model/channel/channel_id.rs b/src/model/channel/channel_id.rs
index e3034f7..48003ef 100644
--- a/src/model/channel/channel_id.rs
+++ b/src/model/channel/channel_id.rs
@@ -92,7 +92,7 @@ impl ChannelId {
     }
 
     fn _create_reaction(
-        &self,
+        self,
         message_id: MessageId,
         reaction_type: &ReactionType,
     ) -> Result<()> {
@@ -118,7 +118,7 @@ impl ChannelId {
         self._delete_message(message_id.into())
     }
 
-    fn _delete_message(&self, message_id: MessageId) -> Result<()> {
+    fn _delete_message(self, message_id: MessageId) -> Result<()> {
         http::delete_message(self.0, message_id.0)
     }
 
@@ -146,14 +146,14 @@ impl ChannelId {
             .map(|message_id| message_id.as_ref().0)
             .collect::<Vec<u64>>();
 
-        self._delete_messages(ids)
+        self._delete_messages(&ids)
     }
 
-    fn _delete_messages(&self, ids: Vec<u64>) -> Result<()> {
+    fn _delete_messages(self, ids: &[u64]) -> Result<()> {
         let len = ids.len();
 
         if len == 0 || len > 100 {
-            return Err(Error::Model(ModelError::BulkDeleteAmount));
+            Err(Error::Model(ModelError::BulkDeleteAmount))
         } else if ids.len() == 1 {
             self.delete_message(ids[0])
         } else {
@@ -194,13 +194,13 @@ impl ChannelId {
         where M: Into<MessageId>, R: Into<ReactionType> {
         self._delete_reaction(
             message_id.into(),
-            user_id.into(),
+            user_id,
             &reaction_type.into(),
         )
     }
 
     fn _delete_reaction(
-        &self,
+        self,
         message_id: MessageId,
         user_id: Option<UserId>,
         reaction_type: &ReactionType,
@@ -266,7 +266,7 @@ impl ChannelId {
         self._edit_message(message_id.into(), f)
     }
 
-    fn _edit_message<F>(&self, message_id: MessageId, f: F) -> Result<Message>
+    fn _edit_message<F>(self, message_id: MessageId, f: F) -> Result<Message>
         where F: FnOnce(EditMessage) -> EditMessage {
         let msg = f(EditMessage::default());
 
@@ -317,13 +317,12 @@ impl ChannelId {
         self._message(message_id.into())
     }
 
-    fn _message(&self, message_id: MessageId) -> Result<Message> {
-        http::get_message(self.0, message_id.0)
-            .map(|mut msg| {
-                msg.transform_content();
+    fn _message(self, message_id: MessageId) -> Result<Message> {
+        http::get_message(self.0, message_id.0).map(|mut msg| {
+            msg.transform_content();
 
-                msg
-            })
+            msg
+        })
     }
 
     /// Gets messages from the channel.
@@ -394,7 +393,7 @@ impl ChannelId {
         self._pin(message_id.into())
     }
 
-    fn _pin(&self, message_id: MessageId) -> Result<()> {
+    fn _pin(self, message_id: MessageId) -> Result<()> {
         http::pin_message(self.0, message_id.0)
     }
 
@@ -433,7 +432,7 @@ impl ChannelId {
     }
 
     fn _reaction_users(
-        &self,
+        self,
         message_id: MessageId,
         reaction_type: &ReactionType,
         limit: Option<u8>,
@@ -592,7 +591,7 @@ impl ChannelId {
         self._unpin(message_id.into())
     }
 
-    fn _unpin(&self, message_id: MessageId) -> Result<()> {
+    fn _unpin(self, message_id: MessageId) -> Result<()> {
         http::unpin_message(self.0, message_id.0)
     }
 
diff --git a/src/model/channel/embed.rs b/src/model/channel/embed.rs
index b776d27..0e6fe8e 100644
--- a/src/model/channel/embed.rs
+++ b/src/model/channel/embed.rs
@@ -143,8 +143,8 @@ impl EmbedField {
 
     fn _new(name: String, value: String, inline: bool) -> Self {
         Self {
-            name: name,
-            value: value,
+            name,
+            value,
             inline,
         }
     }
diff --git a/src/model/event.rs b/src/model/event.rs
index 7a7e3de..c4d13ff 100644
--- a/src/model/event.rs
+++ b/src/model/event.rs
@@ -229,9 +229,9 @@ impl CacheUpdate for ChannelRecipientAddEvent {
         cache.update_user_entry(&self.user);
         let user = Arc::clone(&cache.users[&self.user.id]);
 
-        cache.groups.get_mut(&self.channel_id).map(|group| {
+        if let Some(group) = cache.groups.get_mut(&self.channel_id) {
             group.write().recipients.insert(self.user.id, user);
-        });
+        }
 
         None
     }
@@ -295,16 +295,16 @@ impl CacheUpdate for ChannelUpdateEvent {
                 let (guild_id, channel_id) = channel.with(|channel| (channel.guild_id, channel.id));
 
                 cache.channels.insert(channel_id, Arc::clone(channel));
-                cache.guilds.get_mut(&guild_id).map(|guild| {
+
+                if let Some(guild) = cache.guilds.get_mut(&guild_id) {
                     guild
-                        .with_mut(|g| g.channels.insert(channel_id, Arc::clone(channel)))
-                });
+                        .with_mut(|g| g.channels.insert(channel_id, Arc::clone(channel)));
+                }
             },
             Channel::Private(ref channel) => {
-                cache
-                    .private_channels
-                    .get_mut(&channel.read().id)
-                    .map(|private| private.clone_from(channel));
+                if let Some(private) = cache.private_channels.get_mut(&channel.read().id) {
+                    private.clone_from(channel);
+                }
             },
             Channel::Category(ref category) => {
                 cache
@@ -441,11 +441,11 @@ impl CacheUpdate for GuildEmojisUpdateEvent {
     type Output = ();
 
     fn update(&mut self, cache: &mut Cache) -> Option<()> {
-        cache.guilds.get_mut(&self.guild_id).map(|guild| {
+        if let Some(guild) = cache.guilds.get_mut(&self.guild_id) {
             guild.with_mut(|g| {
                 g.emojis.clone_from(&self.emojis)
             });
-        });
+        }
 
         None
     }
@@ -473,12 +473,12 @@ impl CacheUpdate for GuildMemberAddEvent {
         // Always safe due to being inserted above.
         self.member.user = Arc::clone(&cache.users[&user_id]);
 
-        cache.guilds.get_mut(&self.guild_id).map(|guild| {
+        if let Some(guild) = cache.guilds.get_mut(&self.guild_id) {
             guild.with_mut(|guild| {
                 guild.member_count += 1;
                 guild.members.insert(user_id, self.member.clone());
-            })
-        });
+            });
+        }
 
         None
     }
@@ -490,7 +490,7 @@ impl<'de> Deserialize<'de> for GuildMemberAddEvent {
 
         let guild_id = map.get("guild_id")
             .ok_or_else(|| DeError::custom("missing member add guild id"))
-            .and_then(|v| GuildId::deserialize(v))
+            .and_then(GuildId::deserialize)
             .map_err(DeError::custom)?;
 
         Ok(GuildMemberAddEvent {
@@ -592,9 +592,9 @@ impl CacheUpdate for GuildMembersChunkEvent {
             cache.update_user_entry(&member.user.read());
         }
 
-        cache.guilds.get_mut(&self.guild_id).map(|guild| {
+        if let Some(guild) = cache.guilds.get_mut(&self.guild_id) {
             guild.with_mut(|g| g.members.extend(self.members.clone()))
-        });
+        }
 
         None
     }
@@ -606,7 +606,7 @@ impl<'de> Deserialize<'de> for GuildMembersChunkEvent {
 
         let guild_id = map.get("guild_id")
             .ok_or_else(|| DeError::custom("missing member chunk guild id"))
-            .and_then(|v| GuildId::deserialize(v))
+            .and_then(GuildId::deserialize)
             .map_err(DeError::custom)?;
 
         let mut members = map.remove("members")
@@ -729,7 +729,7 @@ impl CacheUpdate for GuildUpdateEvent {
     type Output = ();
 
     fn update(&mut self, cache: &mut Cache) -> Option<()> {
-        cache.guilds.get_mut(&self.guild.id).map(|guild| {
+        if let Some(guild) = cache.guilds.get_mut(&self.guild.id) {
             let mut guild = guild.write();
 
             guild.afk_timeout = self.guild.afk_timeout;
@@ -740,7 +740,7 @@ impl CacheUpdate for GuildUpdateEvent {
             guild.region.clone_from(&self.guild.region);
             guild.roles.clone_from(&self.guild.roles);
             guild.verification_level = self.guild.verification_level;
-        });
+        }
 
         None
     }
@@ -862,7 +862,7 @@ impl CacheUpdate for MessageUpdateEvent {
             message.content = content;
         }
 
-        if let Some(edited_timestamp) = self.edited_timestamp.clone() {
+        if let Some(edited_timestamp) = self.edited_timestamp {
             message.edited_timestamp = Some(edited_timestamp);
         }
 
diff --git a/src/model/gateway.rs b/src/model/gateway.rs
index e795077..b73d900 100644
--- a/src/model/gateway.rs
+++ b/src/model/gateway.rs
@@ -238,7 +238,7 @@ impl<'de> Deserialize<'de> for Presence {
             let user_id = user_map
                 .remove("id")
                 .ok_or_else(|| DeError::custom("Missing presence user id"))
-                .and_then(|x| UserId::deserialize(x))
+                .and_then(UserId::deserialize)
                 .map_err(DeError::custom)?;
 
             (user_id, None)
diff --git a/src/model/guild/audit_log.rs b/src/model/guild/audit_log.rs
index 1c24d98..e4a344c 100644
--- a/src/model/guild/audit_log.rs
+++ b/src/model/guild/audit_log.rs
@@ -277,7 +277,7 @@ mod u64_handler {
             }
 
             fn visit_str<E: de::Error>(self, string: &str) -> StdResult<u64, E> {
-                string.parse().map_err(|e| de::Error::custom(e))
+                string.parse().map_err(de::Error::custom)
             }
         }
 
@@ -315,7 +315,7 @@ mod option_u64_handler {
             }
 
             fn visit_str<E: de::Error>(self, string: &str) -> StdResult<Option<u64>, E> {
-                string.parse().map(Some).map_err(|e| de::Error::custom(e))
+                string.parse().map(Some).map_err(de::Error::custom)
             }
         }
 
diff --git a/src/model/guild/guild_id.rs b/src/model/guild/guild_id.rs
index a209369..9c3120a 100644
--- a/src/model/guild/guild_id.rs
+++ b/src/model/guild/guild_id.rs
@@ -54,7 +54,7 @@ impl GuildId {
         self._ban(user.into(), (ban_options.dmd(), ban_options.reason()))
     }
 
-    fn _ban(&self, user: UserId, ban_options: (u8, &str)) -> Result<()> {
+    fn _ban(self, user: UserId, ban_options: (u8, &str)) -> Result<()> {
         let (dmd, reason) = ban_options;
 
         if dmd > 7 {
@@ -124,7 +124,7 @@ impl GuildId {
     }
 
     fn _create_channel(
-        &self,
+        self,
         name: &str,
         kind: ChannelType,
         category: Option<ChannelId>,
@@ -177,7 +177,7 @@ impl GuildId {
     }
 
     fn _create_integration(
-        &self,
+        self,
         integration_id: IntegrationId,
         kind: &str,
     ) -> Result<()> {
@@ -232,7 +232,7 @@ impl GuildId {
         self._delete_emoji(emoji_id.into())
     }
 
-    fn _delete_emoji(&self, emoji_id: EmojiId) -> Result<()> {
+    fn _delete_emoji(self, emoji_id: EmojiId) -> Result<()> {
         http::delete_emoji(self.0, emoji_id.0)
     }
 
@@ -246,7 +246,7 @@ impl GuildId {
         self._delete_integration(integration_id.into())
     }
 
-    fn _delete_integration(&self, integration_id: IntegrationId) -> Result<()> {
+    fn _delete_integration(self, integration_id: IntegrationId) -> Result<()> {
         http::delete_guild_integration(self.0, integration_id.0)
     }
 
@@ -265,7 +265,7 @@ impl GuildId {
         self._delete_role(role_id.into())
     }
 
-    fn _delete_role(&self, role_id: RoleId) -> Result<()> {
+    fn _delete_role(self, role_id: RoleId) -> Result<()> {
         http::delete_role(self.0, role_id.0)
     }
 
@@ -300,7 +300,7 @@ impl GuildId {
         self._edit_emoji(emoji_id.into(), name)
     }
 
-    fn _edit_emoji(&self, emoji_id: EmojiId, name: &str) -> Result<Emoji> {
+    fn _edit_emoji(self, emoji_id: EmojiId, name: &str) -> Result<Emoji> {
         let map = json!({
             "name": name,
         });
@@ -327,7 +327,7 @@ impl GuildId {
         self._edit_member(user_id.into(), f)
     }
 
-    fn _edit_member<F>(&self, user_id: UserId, f: F) -> Result<()>
+    fn _edit_member<F>(self, user_id: UserId, f: F) -> Result<()>
         where F: FnOnce(EditMember) -> EditMember {
         let map = utils::vecmap_to_json_map(f(EditMember::default()).0);
 
@@ -368,7 +368,7 @@ impl GuildId {
         self._edit_role(role_id.into(), f)
     }
 
-    fn _edit_role<F>(&self, role_id: RoleId, f: F) -> Result<Role>
+    fn _edit_role<F>(self, role_id: RoleId, f: F) -> Result<Role>
         where F: FnOnce(EditRole) -> EditRole {
         let map = utils::vecmap_to_json_map(f(EditRole::default()).0);
 
@@ -622,7 +622,7 @@ impl GuildId {
         self._unban(user_id.into())
     }
 
-    fn _unban(&self, user_id: UserId) -> Result<()> {
+    fn _unban(self, user_id: UserId) -> Result<()> {
         http::remove_ban(self.0, user_id.0)
     }
 
diff --git a/src/model/user.rs b/src/model/user.rs
index 48891d3..a378be5 100644
--- a/src/model/user.rs
+++ b/src/model/user.rs
@@ -584,7 +584,7 @@ impl User {
     }
 
     fn _has_role(&self, guild: GuildContainer, role: RoleId) -> bool {
-        match guild.into() {
+        match guild {
             GuildContainer::Guild(guild) => guild.roles.contains_key(&role),
             GuildContainer::Id(_guild_id) => {
                 feature_cache! {{
diff --git a/src/model/webhook.rs b/src/model/webhook.rs
index 65dae34..68d6012 100644
--- a/src/model/webhook.rs
+++ b/src/model/webhook.rs
@@ -226,5 +226,5 @@ impl WebhookId {
     ///
     /// [Manage Webhooks]: permissions/constant.MANAGE_WEBHOOKS.html
     #[inline]
-    pub fn get(&self) -> Result<Webhook> { http::get_webhook(self.0) }
+    pub fn get(self) -> Result<Webhook> { http::get_webhook(self.0) }
 }
diff --git a/src/utils/colour.rs b/src/utils/colour.rs
index 3b31572..c901e9b 100644
--- a/src/utils/colour.rs
+++ b/src/utils/colour.rs
@@ -133,10 +133,10 @@ impl Colour {
     /// assert_eq!(colour.b(), 215);
     /// assert_eq!(colour.tuple(), (217, 45, 215));
     /// ```
-    pub fn from_rgb(r: u8, g: u8, b: u8) -> Colour {
-        let mut uint = u32::from(r);
-        uint = (uint << 8) | (u32::from(g));
-        uint = (uint << 8) | (u32::from(b));
+    pub fn from_rgb(red: u8, green: u8, blue: u8) -> Colour {
+        let mut uint = u32::from(red);
+        uint = (uint << 8) | (u32::from(green));
+        uint = (uint << 8) | (u32::from(blue));
 
         Colour(uint)
     }
@@ -241,7 +241,9 @@ impl From<u64> for Colour {
 
 impl From<(u8, u8, u8)> for Colour {
     /// Constructs a Colour from rgb.
-    fn from((r, g, b): (u8, u8, u8)) -> Self { Colour::from_rgb(r, g, b) }
+    fn from((red, green, blue): (u8, u8, u8)) -> Self {
+        Colour::from_rgb(red, green, blue)
+    }
 }
 
 colour! {
diff --git a/src/utils/message_builder.rs b/src/utils/message_builder.rs
index 15c0b07..7bbfddf 100644
--- a/src/utils/message_builder.rs
+++ b/src/utils/message_builder.rs
@@ -205,11 +205,11 @@ impl MessageBuilder {
     /// ```
     #[inline]
     pub fn push<D: I>(self, content: D) -> Self {
-        self._push(content.into().to_string())
+        self._push(&content.into().to_string())
     }
 
-    fn _push(mut self, content: String) -> Self {
-        self.0.push_str(&content);
+    fn _push(mut self, content: &str) -> Self {
+        self.0.push_str(content);
 
         self
     }