aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-08-18 16:14:32 -0700
committerZeyla Hellyer <[email protected]>2017-08-18 17:52:53 -0700
commite4113570967a1fb13539efbfa2cf7285b19d95ba (patch)
tree06bb020fcfaa5f8323454dfb525272314a900186 /src/client
parentMove Clippy lints to a cfg_attr (diff)
downloadserenity-e4113570967a1fb13539efbfa2cf7285b19d95ba.tar.xz
serenity-e4113570967a1fb13539efbfa2cf7285b19d95ba.zip
Apply rustfmt
Diffstat (limited to 'src/client')
-rw-r--r--src/client/dispatch.rs63
-rw-r--r--src/client/mod.rs13
2 files changed, 62 insertions, 14 deletions
diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs
index cb33cb1..a3d528e 100644
--- a/src/client/dispatch.rs
+++ b/src/client/dispatch.rs
@@ -172,7 +172,8 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
let context = context(conn, data);
match event.channel {
- Channel::Private(_) | Channel::Group(_) => {},
+ Channel::Private(_) |
+ Channel::Group(_) => {},
Channel::Guild(channel) => {
let h = event_handler.clone();
tokio_handle.spawn_fn(move || {
@@ -198,7 +199,11 @@ 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(())
});
},
@@ -209,7 +214,11 @@ 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(())
});
},
@@ -323,7 +332,11 @@ 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(())
});
},
@@ -343,7 +356,11 @@ 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(())
});
},
@@ -397,7 +414,11 @@ 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(())
});
},
@@ -488,7 +509,11 @@ 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(())
});
},
@@ -497,7 +522,11 @@ 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(())
});
},
@@ -553,7 +582,11 @@ 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(())
});
},
@@ -643,7 +676,11 @@ 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(())
});
},
@@ -652,7 +689,11 @@ 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 619653c..1a576f2 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -540,7 +540,10 @@ 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.
@@ -665,7 +668,10 @@ 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.
@@ -723,7 +729,8 @@ impl<H: EventHandler + 'static> Client<H> {
Ok(shard) => {
let shard = Arc::new(Mutex::new(shard));
- let monitor_info = feature_framework! {{
+ let monitor_info =
+ feature_framework! {{
MonitorInfo {
data: self.data.clone(),
event_handler: self.event_handler.clone(),