aboutsummaryrefslogtreecommitdiff
path: root/src/model/user.rs
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-09-18 10:47:19 -0700
committerZeyla Hellyer <[email protected]>2017-09-18 17:48:37 -0700
commit8e3b4d601ffb78909db859640482f7e0bb10131f (patch)
tree16500c9274a0517a776ea707bb623d1c9947d8cf /src/model/user.rs
parentApply rustfmt (diff)
downloadserenity-8e3b4d601ffb78909db859640482f7e0bb10131f.tar.xz
serenity-8e3b4d601ffb78909db859640482f7e0bb10131f.zip
Fix compiles of a variety of feature combinations
This fixes compilation errors and warnings when compiling a mixture of non-default feature targets.
Diffstat (limited to 'src/model/user.rs')
-rw-r--r--src/model/user.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/model/user.rs b/src/model/user.rs
index 60efa21..c65a860 100644
--- a/src/model/user.rs
+++ b/src/model/user.rs
@@ -11,11 +11,11 @@ use chrono::NaiveDateTime;
use std::fmt::Write;
#[cfg(feature = "model")]
use std::mem;
-#[cfg(feature = "cache")]
+#[cfg(all(feature = "cache", feature = "model"))]
use std::sync::{Arc, RwLock};
#[cfg(feature = "model")]
use builder::{CreateMessage, EditProfile};
-#[cfg(feature = "cache")]
+#[cfg(all(feature = "cache", feature = "model"))]
use CACHE;
#[cfg(feature = "model")]
use http::{self, GuildPagination};