Fix clippy warnings (#1589)

This fixes the following warnings:
- `clippy::format_in_format_args`
- `clippy::or_fun_call`
- `clippy::redundant_closure`
- `clippy::to_string_in_format_args`
- `clippy::unnecessary_cast`
- `unused_imports`

src/builder/create_components.rs

@@ -203,7 +203,7 @@ impl CreateButton {
     }
 
     pub fn build(mut self) -> Value {
-        self.0.insert("type", from_number(2_u8 as u8));
+        self.0.insert("type", from_number(2_u8));
 
         utils::hashmap_to_json_map(self.0.clone()).into()
     }

src/client/bridge/gateway/shard_manager.rs

@@ -127,8 +127,8 @@ impl ShardManager {
 
         let mut shard_queuer = ShardQueuer {
             data: Arc::clone(opt.data),
-            event_handler: opt.event_handler.as_ref().map(|h| Arc::clone(h)),
-            raw_event_handler: opt.raw_event_handler.as_ref().map(|rh| Arc::clone(rh)),
+            event_handler: opt.event_handler.as_ref().map(Arc::clone),
+            raw_event_handler: opt.raw_event_handler.as_ref().map(Arc::clone),
             #[cfg(feature = "framework")]
             framework: Arc::clone(opt.framework),
             last_start: None,

src/client/bridge/gateway/shard_queuer.rs

@@ -192,8 +192,8 @@ impl ShardQueuer {
 
         let mut runner = ShardRunner::new(ShardRunnerOptions {
             data: Arc::clone(&self.data),
-            event_handler: self.event_handler.as_ref().map(|eh| Arc::clone(eh)),
-            raw_event_handler: self.raw_event_handler.as_ref().map(|rh| Arc::clone(rh)),
+            event_handler: self.event_handler.as_ref().map(Arc::clone),
+            raw_event_handler: self.raw_event_handler.as_ref().map(Arc::clone),
             #[cfg(feature = "framework")]
             framework: Arc::clone(&self.framework),
             manager_tx: self.manager_tx.clone(),

src/framework/standard/help_commands.rs

@@ -1451,9 +1451,9 @@ fn single_command_to_plain_string(help_options: &HelpOptions, command: &Command<
     if !command.sub_commands.is_empty() {
         let _ = writeln!(
             result,
-            "**{}**: {}",
+            "**{}**: `{}`",
             help_options.sub_commands_label,
-            format!("`{}`", command.sub_commands.join("`, `"))
+            command.sub_commands.join("`, `"),
         );
     }
 

src/model/channel/reaction.rs

@@ -1,11 +1,8 @@
 #[cfg(feature = "model")]
 use std::cmp::Ordering;
 use std::convert::TryFrom;
+use std::fmt::{self, Display, Formatter, Result as FmtResult, Write as FmtWrite};
 use std::str::FromStr;
-use std::{
-    error::Error as StdError,
-    fmt::{self, Display, Formatter, Result as FmtResult, Write as FmtWrite},
-};
 
 use serde::de::{Deserialize, Error as DeError, MapAccess, Visitor};
 use serde::ser::{Serialize, SerializeMap, Serializer};

src/model/guild/guild_id.rs

@@ -1520,7 +1520,7 @@ impl GuildId {
 
     /// Get the widget image URL.
     pub fn widget_image_url(&self, style: GuildWidgetStyle) -> String {
-        format!(api!("/guilds/{}/widget.png?style={}"), self.0.to_string(), style.to_string())
+        format!(api!("/guilds/{}/widget.png?style={}"), self.0, style)
     }
 
     /// Gets the guild active threads.

src/model/interactions/application_command.rs

@@ -384,7 +384,7 @@ impl<'de> Deserialize<'de> for ApplicationCommandInteraction {
             map.remove("user").map(User::deserialize).transpose().map_err(DeError::custom)?;
 
         let user = user
-            .or(member.as_ref().map(|m| m.user.clone()))
+            .or_else(|| member.as_ref().map(|m| m.user.clone()))
             .ok_or_else(|| DeError::custom("expected user or member"))?;
 
         let token = map

src/model/interactions/autocomplete.rs

@@ -161,7 +161,7 @@ impl<'de> Deserialize<'de> for AutocompleteInteraction {
             map.remove("user").map(User::deserialize).transpose().map_err(DeError::custom)?;
 
         let user = user
-            .or(member.as_ref().map(|m| m.user.clone()))
+            .or_else(|| member.as_ref().map(|m| m.user.clone()))
             .ok_or_else(|| DeError::custom("expected user or member"))?;
 
         let token = map

src/model/interactions/message_component.rs

@@ -353,7 +353,7 @@ impl<'de> Deserialize<'de> for MessageComponentInteraction {
             map.remove("user").map(User::deserialize).transpose().map_err(DeError::custom)?;
 
         let user = user
-            .or(member.as_ref().map(|m| m.user.clone()))
+            .or_else(|| member.as_ref().map(|m| m.user.clone()))
             .ok_or_else(|| DeError::custom("expected user or member"))?;
 
         let message = map