diff options
| author | Zeyla Hellyer <[email protected]> | 2017-09-18 17:48:52 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-09-18 17:48:52 -0700 |
| commit | dae2cb77b407044f44a7a2790d93efba3891854e (patch) | |
| tree | bef263c4490536cf8b56e988e71dd1aa43bc2696 /src/client/mod.rs | |
| parent | Fix compiles of a variety of feature combinations (diff) | |
| download | serenity-dae2cb77b407044f44a7a2790d93efba3891854e.tar.xz serenity-dae2cb77b407044f44a7a2790d93efba3891854e.zip | |
Apply rustfmt
Diffstat (limited to 'src/client/mod.rs')
| -rw-r--r-- | src/client/mod.rs | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/client/mod.rs b/src/client/mod.rs index ea98cdb..6bd1579 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::{ATOMIC_BOOL_INIT, AtomicBool, Ordering}; +use std::sync::atomic::{AtomicBool, Ordering, ATOMIC_BOOL_INIT}; use parking_lot::Mutex; use tokio_core::reactor::Core; use futures; @@ -195,8 +195,7 @@ pub struct Client<H: EventHandler + 'static> { /// [`Event::Ready`]: ../model/event/enum.Event.html#variant.Ready /// [`on_ready`]: #method.on_ready event_handler: Arc<H>, - #[cfg(feature = "framework")] - framework: Arc<sync::Mutex<Option<Box<Framework>>>>, + #[cfg(feature = "framework")] framework: Arc<sync::Mutex<Option<Box<Framework>>>>, /// A HashMap of all shards instantiated by the Client. /// /// The key is the shard ID and the value is the shard itself. @@ -594,10 +593,7 @@ impl<H: EventHandler + 'static> Client<H> { /// [`start_autosharded`]: #method.start_autosharded /// [gateway docs]: gateway/index.html#sharding pub fn start_shard(&mut self, shard: u64, shards: u64) -> Result<()> { - self.start_connection( - [shard, shard, shards], - http::get_gateway()?.url, - ) + self.start_connection([shard, shard, shards], http::get_gateway()?.url) } /// Establish sharded connections and start listening for events. @@ -722,10 +718,7 @@ impl<H: EventHandler + 'static> Client<H> { /// [`start_shards`]: #method.start_shards /// [Gateway docs]: gateway/index.html#sharding pub fn start_shard_range(&mut self, range: [u64; 2], total_shards: u64) -> Result<()> { - self.start_connection( - [range[0], range[1], total_shards], - http::get_gateway()?.url, - ) + self.start_connection([range[0], range[1], total_shards], http::get_gateway()?.url) } /// Returns a thread-safe handle for closing shards. @@ -785,8 +778,7 @@ impl<H: EventHandler + 'static> Client<H> { self.shards.lock().insert(shard_number, shard.clone()); - let monitor_info = - feature_framework! {{ + let monitor_info = feature_framework! {{ MonitorInfo { data: self.data.clone(), event_handler: self.event_handler.clone(), |