aboutsummaryrefslogtreecommitdiff
path: root/src/client/mod.rs
diff options
context:
space:
mode:
authoracdenisSK <[email protected]>2017-07-27 03:16:00 +0200
committeracdenisSK <[email protected]>2017-07-27 03:41:41 +0200
commit7d0c182ce9d8e9ed090eca2f786bbaa34ba33154 (patch)
tree8127b7a8421764515202cb801328b38fbe4ad195 /src/client/mod.rs
parentFix condional compilation for `Framework::initialized` when builtin-framework... (diff)
downloadserenity-7d0c182ce9d8e9ed090eca2f786bbaa34ba33154.tar.xz
serenity-7d0c182ce9d8e9ed090eca2f786bbaa34ba33154.zip
Make the `framework` module feature-gated and fix the names in the helper macro
Diffstat (limited to 'src/client/mod.rs')
-rw-r--r--src/client/mod.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/mod.rs b/src/client/mod.rs
index 07db5b7..a4e5fe5 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -51,8 +51,8 @@ use ::internal::prelude::*;
use ::internal::ws_impl::ReceiverExt;
use ::model::event::*;
-#[cfg(any(feature="framework", feature="builtin_framework"))]
-use ::framework::Framework;
+#[cfg(feature="framework")]
+use ::Framework;
static HANDLE_STILL: AtomicBool = ATOMIC_BOOL_INIT;
@@ -295,7 +295,7 @@ impl<H: EventHandler + 'static> Client<H> {
/// # use serenity::prelude::EventHandler;
/// # use std::error::Error;
/// #
- /// use serenity::framework::Framework;
+ /// use serenity::Framework;
/// use serenity::client::Context;
/// use serenity::model::*;
/// use tokio_core::reactor::Handle;