aboutsummaryrefslogtreecommitdiff
path: root/src/client/context.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/client/context.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/client/context.rs')
-rw-r--r--src/client/context.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/context.rs b/src/client/context.rs
index e93d40b..9ed3652 100644
--- a/src/client/context.rs
+++ b/src/client/context.rs
@@ -1,3 +1,4 @@
+use Result;
use std::sync::Arc;
use typemap::ShareMap;
use gateway::Shard;
@@ -5,7 +6,7 @@ use model::*;
use parking_lot::Mutex;
use tokio_core::reactor::Handle;
-#[cfg(feature = "cache")]
+#[cfg(all(feature = "builder", feature = "cache"))]
use super::CACHE;
#[cfg(feature = "builder")]
use internal::prelude::*;