aboutsummaryrefslogtreecommitdiff
path: root/src/model/guild/emoji.rs
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-06-02 08:26:24 -0700
committerZeyla Hellyer <[email protected]>2017-06-02 08:26:24 -0700
commit7a96b8a1356e50b2bff5d5e03d43361a052517c6 (patch)
treed0df182f288e959bd73f4c610c7af4f0dfacf5a8 /src/model/guild/emoji.rs
parentAdd User::refresh (diff)
downloadserenity-7a96b8a1356e50b2bff5d5e03d43361a052517c6.tar.xz
serenity-7a96b8a1356e50b2bff5d5e03d43361a052517c6.zip
Fix compilations across feature combinations
Diffstat (limited to 'src/model/guild/emoji.rs')
-rw-r--r--src/model/guild/emoji.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/model/guild/emoji.rs b/src/model/guild/emoji.rs
index 2de4e30..f2c7e91 100644
--- a/src/model/guild/emoji.rs
+++ b/src/model/guild/emoji.rs
@@ -1,13 +1,15 @@
use std::fmt::{Display, Formatter, Result as FmtResult, Write as FmtWrite};
-use super::super::{EmojiId, ModelError, RoleId};
+use super::super::{EmojiId, RoleId};
#[cfg(feature="cache")]
use std::mem;
+#[cfg(all(feature="cache", feature="model"))]
+use super::super::ModelError;
#[cfg(feature="cache")]
use ::CACHE;
#[cfg(feature="cache")]
use ::internal::prelude::*;
-#[cfg(feature="model")]
+#[cfg(all(feature="cache", feature="model"))]
use ::http;
#[cfg(feature="cache")]
use super::super::GuildId;