Apply rustfmt

2 files changed, 17 insertions, 66 deletions

diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs
index 04739b6..494ab6d 100644
--- a/src/client/dispatch.rs
+++ b/src/client/dispatch.rs
@@ -158,8 +158,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
             let context = context(conn, data, tokio_handle);
 
             match event.channel {
-                Channel::Private(_) |
-                Channel::Group(_) => {},
+                Channel::Private(_) | Channel::Group(_) => {},
                 Channel::Guild(channel) => {
                     let h = event_handler.clone();
                     tokio_handle.spawn_fn(move || {
@@ -192,11 +191,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
 
             let h = event_handler.clone();
             tokio_handle.spawn_fn(move || {
-                h.on_channel_recipient_addition(
-                    context,
-                    event.channel_id,
-                    event.user,
-                );
+                h.on_channel_recipient_addition(context, event.channel_id, event.user);
                 Ok(())
             });
         },
@@ -207,11 +202,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
 
             let h = event_handler.clone();
             tokio_handle.spawn_fn(move || {
-                h.on_channel_recipient_removal(
-                    context,
-                    event.channel_id,
-                    event.user,
-                );
+                h.on_channel_recipient_removal(context, event.channel_id, event.user);
                 Ok(())
             });
         },
@@ -253,7 +244,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
             });
         },
         Event::GuildCreate(mut event) => {
-            #[cfg(feature="cache")]
+            #[cfg(feature = "cache")]
             let _is_new = {
                 let cache = CACHE.read().unwrap();
 
@@ -325,11 +316,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
 
             let h = event_handler.clone();
             tokio_handle.spawn_fn(move || {
-                h.on_guild_emojis_update(
-                    context,
-                    event.guild_id,
-                    event.emojis,
-                );
+                h.on_guild_emojis_update(context, event.guild_id, event.emojis);
                 Ok(())
             });
         },
@@ -349,11 +336,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
 
             let h = event_handler.clone();
             tokio_handle.spawn_fn(move || {
-                h.on_guild_member_addition(
-                    context,
-                    event.guild_id,
-                    event.member,
-                );
+                h.on_guild_member_addition(context, event.guild_id, event.member);
                 Ok(())
             });
         },
@@ -409,11 +392,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
 
             let h = event_handler.clone();
             tokio_handle.spawn_fn(move || {
-                h.on_guild_members_chunk(
-                    context,
-                    event.guild_id,
-                    event.members,
-                );
+                h.on_guild_members_chunk(context, event.guild_id, event.members);
                 Ok(())
             });
         },
@@ -506,11 +485,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
 
             let h = event_handler.clone();
             tokio_handle.spawn_fn(move || {
-                h.on_message_delete_bulk(
-                    context,
-                    event.channel_id,
-                    event.ids,
-                );
+                h.on_message_delete_bulk(context, event.channel_id, event.ids);
                 Ok(())
             });
         },
@@ -519,11 +494,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
 
             let h = event_handler.clone();
             tokio_handle.spawn_fn(move || {
-                h.on_message_delete(
-                    context,
-                    event.channel_id,
-                    event.message_id,
-                );
+                h.on_message_delete(context, event.channel_id, event.message_id);
                 Ok(())
             });
         },
@@ -579,11 +550,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
 
             let h = event_handler.clone();
             tokio_handle.spawn_fn(move || {
-                h.on_reaction_remove_all(
-                    context,
-                    event.channel_id,
-                    event.message_id,
-                );
+                h.on_reaction_remove_all(context, event.channel_id, event.message_id);
                 Ok(())
             });
         },
@@ -675,11 +642,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
 
             let h = event_handler.clone();
             tokio_handle.spawn_fn(move || {
-                h.on_voice_state_update(
-                    context,
-                    event.guild_id,
-                    event.voice_state,
-                );
+                h.on_voice_state_update(context, event.guild_id, event.voice_state);
                 Ok(())
             });
         },
@@ -688,11 +651,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
 
             let h = event_handler.clone();
             tokio_handle.spawn_fn(move || {
-                h.on_webhook_update(
-                    context,
-                    event.guild_id,
-                    event.channel_id,
-                );
+                h.on_webhook_update(context, event.guild_id, event.channel_id);
                 Ok(())
             });
         },
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(),