Remove redundant imports

src/builder/bot_auth_parameters.rs

@@ -5,7 +5,6 @@ use url::Url;
 use crate::http::Http;
 #[cfg(feature = "http")]
 use crate::internal::prelude::*;
-use crate::model::application::Scope;
 use crate::model::prelude::*;
 
 /// A builder for constructing an invite link with custom OAuth2 scopes.

src/builder/create_command.rs

@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 #[cfg(feature = "http")]
 use super::Builder;
 #[cfg(feature = "http")]

src/builder/edit_automod_rule.rs

@@ -4,9 +4,7 @@ use super::Builder;
 use crate::http::CacheHttp;
 #[cfg(feature = "http")]
 use crate::internal::prelude::*;
-#[cfg(feature = "http")]
-use crate::model::guild::automod::Rule;
-use crate::model::guild::automod::{Action, EventType, Trigger};
+use crate::model::guild::automod::EventType;
 use crate::model::prelude::*;
 
 /// A builder for creating or editing guild AutoMod rules.

src/cache/mod.rs

@@ -23,7 +23,7 @@
 //! [`Shard`]: crate::gateway::Shard
 //! [`http`]: crate::http
 
-use std::collections::{HashMap, HashSet, VecDeque};
+use std::collections::{HashSet, VecDeque};
 use std::hash::Hash;
 #[cfg(feature = "temp_cache")]
 use std::sync::Arc;

src/client/event_handler.rs

@@ -1,13 +1,8 @@
-use std::collections::HashMap;
-
 use async_trait::async_trait;
 
 use super::context::Context;
 use crate::gateway::ShardStageUpdateEvent;
 use crate::http::RatelimitInfo;
-use crate::model::application::{CommandPermissions, Interaction};
-use crate::model::guild::audit_log::AuditLogEntry;
-use crate::model::guild::automod::{ActionExecution, Rule};
 use crate::model::prelude::*;
 
 macro_rules! event_handler {

src/framework/standard/parse/map.rs

@@ -1,6 +1,3 @@
-use std::collections::HashMap;
-use std::sync::Arc;
-
 use crate::framework::standard::*;
 
 #[derive(Debug)]

src/framework/standard/parse/mod.rs

@@ -1,16 +1,12 @@
 use super::{Command, *};
-use crate::client::Context;
 use crate::model::prelude::*;
 
 pub mod map;
 
 use std::borrow::Cow;
-#[cfg(feature = "cache")]
-use std::collections::HashMap;
 
-use futures::future::{BoxFuture, FutureExt};
-use map::{CommandMap, GroupMap, ParseMap};
-use uwl::Stream;
+use futures::FutureExt;
+use map::ParseMap;
 
 // FIXME: Add the `http` parameter to `Guild::user_permissions_in`.
 //

src/http/client.rs

@@ -31,8 +31,6 @@ use crate::builder::CreateAttachment;
 use crate::constants;
 use crate::internal::prelude::*;
 use crate::json::*;
-use crate::model::application::{Command, CommandPermissions};
-use crate::model::guild::automod::Rule;
 use crate::model::prelude::*;
 
 /// A builder for the underlying [`Http`] client that performs requests to Discord's HTTP API. If

src/model/application/command.rs

@@ -1,14 +1,12 @@
 use std::collections::HashMap;
 
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 
 #[cfg(feature = "model")]
 use crate::builder::{Builder, CreateCommand};
 #[cfg(feature = "model")]
 use crate::http::{CacheHttp, Http};
-#[cfg(feature = "model")]
 use crate::internal::prelude::*;
-use crate::json::Value;
 use crate::model::channel::ChannelType;
 use crate::model::id::{
     ApplicationId,

src/model/application/component.rs

@@ -1,4 +1,4 @@
-use serde::de::{Deserialize, Deserializer, Error as DeError};
+use serde::de::Error as DeError;
 use serde::ser::{Serialize, Serializer};
 
 use crate::internal::prelude::*;

src/model/application/component_interaction.rs

@@ -1,4 +1,4 @@
-use serde::de::{Deserialize, Deserializer, Error as DeError};
+use serde::de::Error as DeError;
 use serde::ser::{Error as _, Serialize};
 
 #[cfg(feature = "model")]

src/model/application/modal_interaction.rs

@@ -1,4 +1,3 @@
-use serde::de::{Deserialize, Deserializer};
 use serde::Serialize;
 
 #[cfg(feature = "model")]

src/model/channel/guild_channel.rs

@@ -30,7 +30,6 @@ use crate::http::{CacheHttp, Http, Typing};
 #[cfg(all(feature = "cache", feature = "model"))]
 use crate::internal::prelude::*;
 use crate::model::prelude::*;
-use crate::model::Timestamp;
 
 /// Represents a guild's text, news, or voice channel. Some methods are available only for voice
 /// channels and some are only available for text channels. News channels are a subset of text

src/model/channel/message.rs

@@ -21,7 +21,6 @@ use crate::constants;
 use crate::gateway::ShardMessenger;
 #[cfg(feature = "model")]
 use crate::http::{CacheHttp, Http};
-use crate::model::application::{ActionRow, MessageInteraction};
 use crate::model::prelude::*;
 use crate::model::utils::StrOrInt;
 #[cfg(all(feature = "model", feature = "cache"))]

src/model/channel/mod.rs

@@ -26,7 +26,6 @@ use crate::http::CacheHttp;
 use crate::json::*;
 use crate::model::prelude::*;
 use crate::model::utils::is_false;
-use crate::model::Timestamp;
 
 #[deprecated = "use CreateAttachment instead"]
 #[cfg(feature = "model")]

src/model/channel/private_channel.rs

@@ -10,7 +10,6 @@ use crate::http::CacheHttp;
 use crate::http::{Http, Typing};
 use crate::model::prelude::*;
 use crate::model::utils::single_recipient;
-use crate::model::Timestamp;
 
 /// A Direct Message text channel with another user.
 ///

src/model/channel/reaction.rs

@@ -6,7 +6,7 @@ use std::str::FromStr;
 
 #[cfg(feature = "http")]
 use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
-use serde::de::{Deserialize, Error as DeError};
+use serde::de::Error as DeError;
 use serde::ser::{Serialize, SerializeMap, Serializer};
 #[cfg(feature = "model")]
 use tracing::warn;

src/model/event.rs

@@ -6,25 +6,19 @@
 // Just for MessageUpdateEvent (for some reason the #[allow] doesn't work when placed directly)
 #![allow(clippy::option_option)]
 
-use std::collections::HashMap;
-
 use serde::de::Error as DeError;
 use serde::Serialize;
 
-use super::application::ActionRow;
-use super::prelude::*;
-use super::utils::{
+use crate::constants::Opcode;
+use crate::model::prelude::*;
+use crate::model::utils::{
     deserialize_val,
     emojis,
     members,
     remove_from_map,
     remove_from_map_opt,
     stickers,
 };
-use crate::constants::Opcode;
-use crate::model::application::{CommandPermissions, Interaction};
-use crate::model::guild::audit_log::AuditLogEntry;
-use crate::model::guild::automod::{ActionExecution, Rule};
 
 /// Requires no gateway intents.
 ///

src/model/guild/audit_log/mod.rs

@@ -1,9 +1,7 @@
 //! Audit log types for administrative actions within guilds.
 
-use std::collections::HashMap;
 use std::mem::transmute;
 
-use serde::de::Deserializer;
 use serde::ser::{Serialize, Serializer};
 
 mod change;

src/model/guild/guild_id.rs

@@ -33,10 +33,6 @@ use crate::http::{CacheHttp, Http, UserPagination};
 use crate::internal::prelude::*;
 #[cfg(feature = "model")]
 use crate::json::json;
-#[cfg(feature = "model")]
-use crate::model::application::{Command, CommandPermissions};
-#[cfg(feature = "model")]
-use crate::model::guild::automod::Rule;
 use crate::model::prelude::*;
 
 #[cfg(feature = "model")]

src/model/guild/integration.rs

@@ -1,5 +1,4 @@
-use super::*;
-use crate::model::Timestamp;
+use crate::model::prelude::*;
 
 /// Various information about integrations.
 ///

src/model/guild/member.rs

@@ -10,11 +10,9 @@ use crate::cache::Cache;
 use crate::http::{CacheHttp, Http};
 #[cfg(all(feature = "cache", feature = "model"))]
 use crate::internal::prelude::*;
-use crate::model::permissions::Permissions;
 use crate::model::prelude::*;
 #[cfg(feature = "model")]
 use crate::model::utils::avatar_url;
-use crate::model::Timestamp;
 
 /// Information about a member of a guild.
 ///

src/model/guild/mod.rs

@@ -60,13 +60,8 @@ use crate::gateway::ShardMessenger;
 use crate::http::{CacheHttp, Http, UserPagination};
 #[cfg(feature = "model")]
 use crate::json::json;
-#[cfg(feature = "model")]
-use crate::model::application::{Command, CommandPermissions};
-#[cfg(feature = "model")]
-use crate::model::guild::automod::Rule;
 use crate::model::prelude::*;
 use crate::model::utils::*;
-use crate::model::Timestamp;
 
 /// A representation of a banning of a user.
 ///

src/model/guild/partial_guild.rs

@@ -22,10 +22,6 @@ use crate::collector::{MessageCollector, ReactionCollector};
 use crate::gateway::ShardMessenger;
 #[cfg(feature = "model")]
 use crate::http::{CacheHttp, Http, UserPagination};
-#[cfg(feature = "model")]
-use crate::model::application::{Command, CommandPermissions};
-#[cfg(feature = "model")]
-use crate::model::guild::automod::Rule;
 use crate::model::prelude::*;
 #[cfg(feature = "model")]
 use crate::model::utils::icon_url;

src/model/user.rs

@@ -23,7 +23,6 @@ use crate::http::CacheHttp;
 use crate::internal::prelude::*;
 #[cfg(feature = "model")]
 use crate::json::json;
-use crate::model::mention::Mentionable;
 #[cfg(feature = "model")]
 use crate::model::utils::avatar_url;
 

src/model/utils.rs

@@ -1,5 +1,4 @@
 use std::borrow::Cow;
-use std::collections::HashMap;
 use std::fmt;
 use std::hash::Hash;
 use std::marker::PhantomData;

src/model/webhook.rs

@@ -4,10 +4,6 @@
 use secrecy::ExposeSecret;
 use secrecy::SecretString;
 
-#[cfg(feature = "model")]
-use super::channel::Message;
-use super::id::{ChannelId, GuildId, WebhookId};
-use super::user::User;
 use super::utils::secret;
 #[cfg(feature = "model")]
 use crate::builder::{Builder, EditWebhook, EditWebhookMessage, ExecuteWebhook};
@@ -18,8 +14,6 @@ use crate::http::{CacheHttp, Http};
 #[cfg(feature = "model")]
 use crate::internal::prelude::*;
 use crate::model::prelude::*;
-#[cfg(feature = "model")]
-use crate::model::ModelError;
 
 enum_number! {
     /// A representation of a type of webhook.

src/utils/custom_message.rs

@@ -1,5 +1,4 @@
 use crate::model::prelude::*;
-use crate::model::Timestamp;
 
 /// A builder for constructing a personal [`Message`] instance. This can be useful for emitting a
 /// manual [`dispatch`] to the framework, but you don't have a message in hand, or just have a