diff options
| author | acdenisSK <[email protected]> | 2018-01-02 18:34:27 +0100 |
|---|---|---|
| committer | acdenisSK <[email protected]> | 2018-01-02 18:34:27 +0100 |
| commit | 26fe139363a847542bbe609fe4d15accbf4fef14 (patch) | |
| tree | e0f0bbcb1d70b9905235366e86c21acac49dadd9 /src/model | |
| parent | Remove builder re-export in utils (diff) | |
| download | serenity-26fe139363a847542bbe609fe4d15accbf4fef14.tar.xz serenity-26fe139363a847542bbe609fe4d15accbf4fef14.zip | |
Move `VecMap` to `utils`
This also fixes no-builder compilation
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/channel/channel_category.rs | 4 | ||||
| -rw-r--r-- | src/model/channel/guild_channel.rs | 4 | ||||
| -rw-r--r-- | src/model/user.rs | 4 |
3 files changed, 5 insertions, 7 deletions
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)] |