Fix compiles of a variety of feature combinations

This fixes compilation errors and warnings when compiling a mixture of
non-default feature targets.

5 files changed, 12 insertions, 11 deletions

diff --git a/src/model/guild/emoji.rs b/src/model/guild/emoji.rs
index 3893f52..b7cc129 100644
--- a/src/model/guild/emoji.rs
+++ b/src/model/guild/emoji.rs
@@ -1,17 +1,17 @@
 use std::fmt::{Display, Formatter, Result as FmtResult, Write as FmtWrite};
 use super::super::{EmojiId, RoleId};
 
-#[cfg(feature = "cache")]
+#[cfg(all(feature = "cache", feature = "model"))]
 use std::mem;
 #[cfg(all(feature = "cache", feature = "model"))]
 use super::super::ModelError;
-#[cfg(feature = "cache")]
+#[cfg(all(feature = "cache", feature = "model"))]
 use CACHE;
-#[cfg(feature = "cache")]
+#[cfg(all(feature = "cache", feature = "model"))]
 use internal::prelude::*;
 #[cfg(all(feature = "cache", feature = "model"))]
 use http;
-#[cfg(feature = "cache")]
+#[cfg(all(feature = "cache", feature = "model"))]
 use super::super::GuildId;
 
 /// Represents a custom guild emoji, which can either be created using the API,
diff --git a/src/model/guild/guild_id.rs b/src/model/guild/guild_id.rs
index 350993a..dc060dd 100644
--- a/src/model/guild/guild_id.rs
+++ b/src/model/guild/guild_id.rs
@@ -1,8 +1,7 @@
 use std::fmt::{Display, Formatter, Result as FmtResult};
 use model::*;
-use model::guild::BanOptions;
 
-#[cfg(feature = "cache")]
+#[cfg(all(feature = "cache", feature = "model"))]
 use CACHE;
 #[cfg(feature = "model")]
 use builder::{EditGuild, EditMember, EditRole};
@@ -10,6 +9,8 @@ use builder::{EditGuild, EditMember, EditRole};
 use http;
 #[cfg(feature = "model")]
 use internal::prelude::*;
+#[cfg(feature = "model")]
+use model::guild::BanOptions;
 
 #[cfg(feature = "model")]
 impl GuildId {
diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs
index 6873dc7..fcd2ccd 100644
--- a/src/model/guild/member.rs
+++ b/src/model/guild/member.rs
@@ -5,9 +5,9 @@ use model::*;
 
 #[cfg(feature = "model")]
 use std::borrow::Cow;
-#[cfg(feature = "cache")]
+#[cfg(all(feature = "cache", feature = "model"))]
 use CACHE;
-#[cfg(feature = "cache")]
+#[cfg(all(feature = "cache", feature = "model"))]
 use internal::prelude::*;
 #[cfg(all(feature = "cache", feature = "model"))]
 use http;
diff --git a/src/model/guild/mod.rs b/src/model/guild/mod.rs
index 47f789e..b4b0461 100644
--- a/src/model/guild/mod.rs
+++ b/src/model/guild/mod.rs
@@ -22,7 +22,7 @@ use serde_json;
 use super::utils::*;
 use model::*;
 
-#[cfg(feature = "cache")]
+#[cfg(all(feature = "cache", feature = "model"))]
 use CACHE;
 #[cfg(feature = "model")]
 use http;
diff --git a/src/model/guild/role.rs b/src/model/guild/role.rs
index 5956113..4b61736 100644
--- a/src/model/guild/role.rs
+++ b/src/model/guild/role.rs
@@ -2,11 +2,11 @@ use std::cmp::Ordering;
 use std::fmt::{Display, Formatter, Result as FmtResult};
 use model::*;
 
-#[cfg(feature = "cache")]
+#[cfg(all(feature = "cache", feature = "model"))]
 use CACHE;
 #[cfg(all(feature = "builder", feature = "cache", feature = "model"))]
 use builder::EditRole;
-#[cfg(feature = "cache")]
+#[cfg(all(feature = "cache", feature = "model"))]
 use internal::prelude::*;
 #[cfg(all(feature = "cache", feature = "model"))]
 use http;