Make the `framework` module feature-gated and fix the names in the helper macro

2 files changed, 6 insertions, 6 deletions

diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs
index 20ed22b..1e81a58 100644
--- a/src/client/dispatch.rs
+++ b/src/client/dispatch.rs
@@ -12,7 +12,7 @@ use chrono::{Utc, Timelike};
 use tokio_core::reactor::Handle;
 
 #[cfg(feature="framework")]
-use ::ext::framework::Framework;
+use ::Framework;
 
 #[cfg(feature="cache")]
 use super::CACHE;
@@ -61,12 +61,12 @@ fn context(conn: &Arc<Mutex<Shard>>,
     Context::new(conn.clone(), data.clone())
 }
 
-#[cfg(feature="builtin-framework")]
+#[cfg(feature="builtin_framework")]
 macro_rules! helper {
 	($enabled:block else $disabled:block) => { $enabled }
 }
 
-#[cfg(not(feature="builtin-framework"))]
+#[cfg(not(feature="builtin_framework"))]
 macro_rules! helper {
 	($enabled:block else $disabled:block) => { $disabled }
 }
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;