diff options
| author | acdenisSK <[email protected]> | 2017-07-27 03:16:00 +0200 |
|---|---|---|
| committer | acdenisSK <[email protected]> | 2017-07-27 03:41:41 +0200 |
| commit | 7d0c182ce9d8e9ed090eca2f786bbaa34ba33154 (patch) | |
| tree | 8127b7a8421764515202cb801328b38fbe4ad195 /src/client/dispatch.rs | |
| parent | Fix condional compilation for `Framework::initialized` when builtin-framework... (diff) | |
| download | serenity-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/dispatch.rs')
| -rw-r--r-- | src/client/dispatch.rs | 6 |
1 files changed, 3 insertions, 3 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 } } |