Fix some clippy lints

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

8 files changed, 54 insertions, 55 deletions

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