aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/builder/create_embed.rs2
-rw-r--r--src/builder/create_invite.rs2
-rw-r--r--src/builder/create_message.rs4
-rw-r--r--src/builder/edit_channel.rs2
-rw-r--r--src/builder/edit_guild.rs2
-rw-r--r--src/builder/edit_member.rs2
-rw-r--r--src/builder/edit_profile.rs2
-rw-r--r--src/builder/edit_role.rs2
-rw-r--r--src/builder/execute_webhook.rs2
-rw-r--r--src/builder/get_messages.rs2
-rw-r--r--src/builder/mod.rs2
-rw-r--r--src/client/context.rs6
-rw-r--r--src/model/channel/channel_category.rs4
-rw-r--r--src/model/channel/guild_channel.rs4
-rw-r--r--src/model/user.rs4
-rw-r--r--src/utils/mod.rs3
-rw-r--r--src/utils/vec_map.rs (renamed from src/builder/vec_map.rs)0
17 files changed, 21 insertions, 24 deletions
diff --git a/src/builder/create_embed.rs b/src/builder/create_embed.rs
index fa8e12b..07f803a 100644
--- a/src/builder/create_embed.rs
+++ b/src/builder/create_embed.rs
@@ -22,7 +22,7 @@ use serde_json::Value;
use std::default::Default;
use std::fmt::Display;
use utils;
-use super::VecMap;
+use utils::VecMap;
#[cfg(feature = "utils")]
use utils::Colour;
diff --git a/src/builder/create_invite.rs b/src/builder/create_invite.rs
index 1e8a7b7..b3344cc 100644
--- a/src/builder/create_invite.rs
+++ b/src/builder/create_invite.rs
@@ -1,7 +1,7 @@
use internal::prelude::*;
use serde_json::Value;
use std::default::Default;
-use super::VecMap;
+use utils::VecMap;
/// A builder to create a [`RichInvite`] for use via [`GuildChannel::create_invite`].
///
diff --git a/src/builder/create_message.rs b/src/builder/create_message.rs
index 4e1bd4b..2a89c0b 100644
--- a/src/builder/create_message.rs
+++ b/src/builder/create_message.rs
@@ -1,8 +1,8 @@
use internal::prelude::*;
use model::channel::ReactionType;
use std::fmt::Display;
-use super::{CreateEmbed, VecMap};
-use utils;
+use super::CreateEmbed;
+use utils::{self, VecMap};
/// A builder to specify the contents of an [`http::send_message`] request,
/// primarily meant for use through [`ChannelId::send_message`].
diff --git a/src/builder/edit_channel.rs b/src/builder/edit_channel.rs
index fca9a51..17df18d 100644
--- a/src/builder/edit_channel.rs
+++ b/src/builder/edit_channel.rs
@@ -1,5 +1,5 @@
use internal::prelude::*;
-use super::VecMap;
+use utils::VecMap;
/// A builder to edit a [`GuildChannel`] for use via [`GuildChannel::edit`]
///
diff --git a/src/builder/edit_guild.rs b/src/builder/edit_guild.rs
index bb03c53..ee6bce6 100644
--- a/src/builder/edit_guild.rs
+++ b/src/builder/edit_guild.rs
@@ -1,6 +1,6 @@
use internal::prelude::*;
use model::prelude::*;
-use super::VecMap;
+use utils::VecMap;
/// A builder to optionally edit certain fields of a [`Guild`]. This is meant
/// for usage with [`Guild::edit`].
diff --git a/src/builder/edit_member.rs b/src/builder/edit_member.rs
index f5bf2e4..efc9fb9 100644
--- a/src/builder/edit_member.rs
+++ b/src/builder/edit_member.rs
@@ -1,6 +1,6 @@
use internal::prelude::*;
use model::id::{ChannelId, RoleId};
-use super::VecMap;
+use utils::VecMap;
/// A builder which edits the properties of a [`Member`], to be used in
/// conjunction with [`Member::edit`].
diff --git a/src/builder/edit_profile.rs b/src/builder/edit_profile.rs
index efa682f..e27fb92 100644
--- a/src/builder/edit_profile.rs
+++ b/src/builder/edit_profile.rs
@@ -1,5 +1,5 @@
use internal::prelude::*;
-use super::VecMap;
+use utils::VecMap;
/// A builder to edit the current user's settings, to be used in conjunction
/// with [`CurrentUser::edit`].
diff --git a/src/builder/edit_role.rs b/src/builder/edit_role.rs
index 059653d..54511ec 100644
--- a/src/builder/edit_role.rs
+++ b/src/builder/edit_role.rs
@@ -1,7 +1,7 @@
use internal::prelude::*;
use model::guild::Role;
use model::Permissions;
-use super::VecMap;
+use utils::VecMap;
/// A builer to create or edit a [`Role`] for use via a number of model methods.
///
diff --git a/src/builder/execute_webhook.rs b/src/builder/execute_webhook.rs
index c7d7915..26600ef 100644
--- a/src/builder/execute_webhook.rs
+++ b/src/builder/execute_webhook.rs
@@ -1,6 +1,6 @@
use serde_json::Value;
use std::default::Default;
-use super::VecMap;
+use utils::VecMap;
/// A builder to create the inner content of a [`Webhook`]'s execution.
///
diff --git a/src/builder/get_messages.rs b/src/builder/get_messages.rs
index 8b34728..01003f6 100644
--- a/src/builder/get_messages.rs
+++ b/src/builder/get_messages.rs
@@ -1,5 +1,5 @@
use model::id::MessageId;
-use super::VecMap;
+use utils::VecMap;
/// Builds a request for a request to the API to retrieve messages.
///
diff --git a/src/builder/mod.rs b/src/builder/mod.rs
index adb44a1..3c59c0d 100644
--- a/src/builder/mod.rs
+++ b/src/builder/mod.rs
@@ -15,9 +15,7 @@ mod edit_profile;
mod edit_role;
mod execute_webhook;
mod get_messages;
-mod vec_map;
-pub use self::vec_map::VecMap;
pub use self::create_embed::{CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter};
pub use self::create_invite::CreateInvite;
pub use self::create_message::CreateMessage;
diff --git a/src/client/context.rs b/src/client/context.rs
index a7bd903..0f66e78 100644
--- a/src/client/context.rs
+++ b/src/client/context.rs
@@ -9,12 +9,12 @@ use typemap::ShareMap;
use builder::EditProfile;
#[cfg(feature = "builder")]
use internal::prelude::*;
-#[cfg(feature = "builder")]
-use builder::VecMap;
#[cfg(all(feature = "builder", feature = "cache"))]
use super::CACHE;
#[cfg(feature = "builder")]
-use {Result, http, utils};
+use {Result, http};
+#[cfg(feature = "builder")]
+use utils::{self, VecMap};
/// The context is a general utility struct provided on event dispatches, which
/// helps with dealing with the current "context" of the event dispatch.
diff --git a/src/model/channel/channel_category.rs b/src/model/channel/channel_category.rs
index 18dbde4..e9e6ccf 100644
--- a/src/model/channel/channel_category.rs
+++ b/src/model/channel/channel_category.rs
@@ -1,13 +1,11 @@
use model::prelude::*;
-#[cfg(feature = "model")]
-use builder::VecMap;
#[cfg(all(feature = "builder", feature = "model"))]
use builder::EditChannel;
#[cfg(all(feature = "builder", feature = "model"))]
use http;
#[cfg(all(feature = "model", feature = "utils"))]
-use utils as serenity_utils;
+use utils::{self as serenity_utils, VecMap};
/// A category of [`GuildChannel`]s.
///
diff --git a/src/model/channel/guild_channel.rs b/src/model/channel/guild_channel.rs
index 749e72b..4d729ea 100644
--- a/src/model/channel/guild_channel.rs
+++ b/src/model/channel/guild_channel.rs
@@ -4,7 +4,7 @@ use model::prelude::*;
#[cfg(all(feature = "cache", feature = "model"))]
use CACHE;
#[cfg(feature = "model")]
-use builder::{VecMap, CreateInvite, CreateMessage, EditChannel, GetMessages};
+use builder::{CreateInvite, CreateMessage, EditChannel, GetMessages};
#[cfg(feature = "model")]
use http::{self, AttachmentType};
#[cfg(all(feature = "cache", feature = "model"))]
@@ -14,7 +14,7 @@ use std::fmt::{Display, Formatter, Result as FmtResult};
#[cfg(feature = "model")]
use std::mem;
#[cfg(all(feature = "model", feature = "utils"))]
-use utils as serenity_utils;
+use utils::{self as serenity_utils, VecMap};
/// Represents a guild's text or voice channel. Some methods are available only
/// for voice channels and some are only available for text channels.
diff --git a/src/model/user.rs b/src/model/user.rs
index 1cedf3e..4a10566 100644
--- a/src/model/user.rs
+++ b/src/model/user.rs
@@ -10,7 +10,7 @@ use model::misc::Mentionable;
#[cfg(all(feature = "cache", feature = "model"))]
use CACHE;
#[cfg(feature = "model")]
-use builder::{VecMap, CreateMessage, EditProfile};
+use builder::{CreateMessage, EditProfile};
#[cfg(feature = "model")]
use chrono::NaiveDateTime;
#[cfg(feature = "model")]
@@ -24,7 +24,7 @@ use std::mem;
#[cfg(all(feature = "cache", feature = "model"))]
use std::sync::Arc;
#[cfg(feature = "model")]
-use utils;
+use utils::{self, VecMap};
/// Information about the current user.
#[derive(Clone, Default, Debug, Deserialize, Serialize)]
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index 63dae43..afd5b59 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -3,11 +3,12 @@
mod colour;
mod message_builder;
+mod vec_map;
pub use self::colour::Colour;
pub use self::message_builder::{Content, ContentModifier, MessageBuilder};
+pub use self::vec_map::VecMap;
-use builder::VecMap;
use base64;
use internal::prelude::*;
use model::id::EmojiId;
diff --git a/src/builder/vec_map.rs b/src/utils/vec_map.rs
index 786bf14..786bf14 100644
--- a/src/builder/vec_map.rs
+++ b/src/utils/vec_map.rs
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-19 09:54:57 +0000