diff options
| author | Zeyla Hellyer <[email protected]> | 2017-11-11 10:05:33 -0800 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-11-11 10:05:33 -0800 |
| commit | 348d52b50780109a77a5223d2ede8e0b9a490cfd (patch) | |
| tree | 1049f8ab6be8f9b22ec69a3746ae37a90c6f6a62 /src/client | |
| parent | Simplify Error's `Display` impl (diff) | |
| download | serenity-348d52b50780109a77a5223d2ede8e0b9a490cfd.tar.xz serenity-348d52b50780109a77a5223d2ede8e0b9a490cfd.zip | |
Re-order use statements alphabetically
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/context.rs | 16 | ||||
| -rw-r--r-- | src/client/dispatch.rs | 4 | ||||
| -rw-r--r-- | src/client/event_handler.rs | 4 | ||||
| -rw-r--r-- | src/client/mod.rs | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/src/client/context.rs b/src/client/context.rs index cc7ee63..88fd157 100644 --- a/src/client/context.rs +++ b/src/client/context.rs @@ -1,20 +1,20 @@ use client::bridge::gateway::{ShardClientMessage, ShardMessenger}; +use model::*; +use parking_lot::Mutex; use std::sync::mpsc::Sender; use std::sync::Arc; use typemap::ShareMap; -use model::*; -use parking_lot::Mutex; -#[cfg(all(feature = "builder", feature = "cache"))] -use super::CACHE; -#[cfg(feature = "builder")] -use internal::prelude::*; #[cfg(feature = "builder")] use builder::EditProfile; #[cfg(feature = "builder")] -use {Result, http, utils}; +use internal::prelude::*; #[cfg(feature = "builder")] use std::collections::HashMap; +#[cfg(all(feature = "builder", feature = "cache"))] +use super::CACHE; +#[cfg(feature = "builder")] +use {Result, http, utils}; /// The context is a general utility struct provided on event dispatches, which /// helps with dealing with the current "context" of the event dispatch. @@ -306,7 +306,7 @@ impl Context { /// /// client.start().unwrap(); /// # } - /// + /// /// # #[cfg(not(feature = "model"))] /// # fn main() {} /// ``` diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs index 9545a6f..38ab570 100644 --- a/src/client/dispatch.rs +++ b/src/client/dispatch.rs @@ -1,3 +1,5 @@ +use model::event::Event; +use model::{Channel, Message}; use std::sync::Arc; use parking_lot::Mutex; use super::bridge::gateway::ShardClientMessage; @@ -5,8 +7,6 @@ use super::event_handler::EventHandler; use super::Context; use std::sync::mpsc::Sender; use typemap::ShareMap; -use model::event::Event; -use model::{Channel, Message}; #[cfg(feature = "cache")] use chrono::{Timelike, Utc}; diff --git a/src/client/event_handler.rs b/src/client/event_handler.rs index 5c2f131..fe13a7a 100644 --- a/src/client/event_handler.rs +++ b/src/client/event_handler.rs @@ -1,10 +1,10 @@ +use model::event::*; +use model::*; use parking_lot::RwLock; use serde_json::Value; use std::collections::HashMap; use std::sync::Arc; use super::context::Context; -use model::event::*; -use model::*; pub trait EventHandler { #[cfg(feature = "cache")] diff --git a/src/client/mod.rs b/src/client/mod.rs index 902e2f2..76dfa7a 100644 --- a/src/client/mod.rs +++ b/src/client/mod.rs @@ -37,15 +37,15 @@ pub use http as rest; #[cfg(feature = "cache")] pub use CACHE; +use http; +use internal::prelude::*; +use parking_lot::Mutex; use self::bridge::gateway::{ShardManager, ShardManagerMonitor}; use self::dispatch::dispatch; use std::sync::Arc; use std::sync::atomic::{AtomicBool, Ordering, ATOMIC_BOOL_INIT}; -use parking_lot::Mutex; use threadpool::ThreadPool; use typemap::ShareMap; -use http; -use internal::prelude::*; #[cfg(feature = "framework")] use framework::Framework; @@ -158,7 +158,7 @@ pub struct Client { /// reg!(ctx "MessageDelete") } /// fn on_message_delete_bulk(&self, ctx: Context, _: ChannelId, _: Vec<MessageId>) { /// reg!(ctx "MessageDeleteBulk") } - /// fn on_message_update(&self, ctx: Context, _: ChannelId, _: MessageId) { + /// fn on_message_update(&self, ctx: Context, _: ChannelId, _: MessageId) { /// reg!(ctx "MessageUpdate") } /// } /// |