aboutsummaryrefslogtreecommitdiff
path: root/src/client/dispatch.rs
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-09-18 17:48:52 -0700
committerZeyla Hellyer <[email protected]>2017-09-18 17:48:52 -0700
commitdae2cb77b407044f44a7a2790d93efba3891854e (patch)
treebef263c4490536cf8b56e988e71dd1aa43bc2696 /src/client/dispatch.rs
parentFix compiles of a variety of feature combinations (diff)
downloadserenity-dae2cb77b407044f44a7a2790d93efba3891854e.tar.xz
serenity-dae2cb77b407044f44a7a2790d93efba3891854e.zip
Apply rustfmt
Diffstat (limited to 'src/client/dispatch.rs')
-rw-r--r--src/client/dispatch.rs65
1 files changed, 12 insertions, 53 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(())
});
},