Move `VecMap` to `utils`

This also fixes no-builder compilation

2 files changed, 3 insertions, 5 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.