aboutsummaryrefslogtreecommitdiff
path: root/src/client/dispatch.rs
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-08-19 09:36:15 -0700
committerZeyla Hellyer <[email protected]>2017-08-19 09:39:44 -0700
commit948b27ce74e8dce458d427d8159f2a821d4d7cec (patch)
treebf82bedd1821ca210e4a9f08644581486738aed6 /src/client/dispatch.rs
parentAdd html_root_url (diff)
downloadserenity-948b27ce74e8dce458d427d8159f2a821d4d7cec.tar.xz
serenity-948b27ce74e8dce458d427d8159f2a821d4d7cec.zip
Move builtin framework impl to its own module
The framework is now moved in its entirity to the `framework` module, with the `Framework` trait currently on its own and the builtin implementation provided. The builtin implementation has been renamed to "Standard". Upgrade path: Rename the `BuiltinFramework` import to `StandardFramework`. Instead of importing builtin framework items from `serenity::framework`, import them from `serenity::framework::standard`. This is the beginning to #60. The root `framework` module (non-standard implementation) will be built more by the time it's closed.
Diffstat (limited to 'src/client/dispatch.rs')
-rw-r--r--src/client/dispatch.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs
index a3d528e..0a2ad8d 100644
--- a/src/client/dispatch.rs
+++ b/src/client/dispatch.rs
@@ -46,12 +46,12 @@ fn context(conn: &Arc<Mutex<Shard>>, data: &Arc<Mutex<ShareMap>>) -> Context {
Context::new(conn.clone(), data.clone())
}
-#[cfg(feature = "builtin_framework")]
+#[cfg(feature = "standard_framework")]
macro_rules! helper {
($enabled:block else $disabled:block) => { $enabled }
}
-#[cfg(not(feature = "builtin_framework"))]
+#[cfg(not(feature = "standard_framework"))]
macro_rules! helper {
($enabled:block else $disabled:block) => { $disabled }
}