diff options
| author | Zeyla Hellyer <[email protected]> | 2017-08-18 15:52:07 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-08-18 17:50:41 -0700 |
| commit | 8e296940b7e40879dcfbb185282b906804ba7e3d (patch) | |
| tree | 54be95fb526748dac526b1c5428eace0e372c0bd /src/client | |
| parent | Clippy (diff) | |
| download | serenity-8e296940b7e40879dcfbb185282b906804ba7e3d.tar.xz serenity-8e296940b7e40879dcfbb185282b906804ba7e3d.zip | |
Move the Framework trait to the framework
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/dispatch.rs | 2 | ||||
| -rw-r--r-- | src/client/mod.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs index ad3660e..cb33cb1 100644 --- a/src/client/dispatch.rs +++ b/src/client/dispatch.rs @@ -12,7 +12,7 @@ use chrono::{Timelike, Utc}; use tokio_core::reactor::Handle; #[cfg(feature = "framework")] -use Framework; +use framework::Framework; #[cfg(feature = "cache")] use super::CACHE; diff --git a/src/client/mod.rs b/src/client/mod.rs index 69d3903..619653c 100644 --- a/src/client/mod.rs +++ b/src/client/mod.rs @@ -37,7 +37,7 @@ pub use CACHE; use self::dispatch::dispatch; use std::sync::{self, Arc}; -use std::sync::atomic::{AtomicBool, Ordering, ATOMIC_BOOL_INIT}; +use std::sync::atomic::{ATOMIC_BOOL_INIT, AtomicBool, Ordering}; use parking_lot::Mutex; use tokio_core::reactor::Core; use futures; @@ -52,7 +52,7 @@ use internal::ws_impl::ReceiverExt; use model::event::*; #[cfg(feature = "framework")] -use Framework; +use framework::Framework; static HANDLE_STILL: AtomicBool = ATOMIC_BOOL_INIT; |