From 6ddfef8359a619be9a49be7b33b466724eed0ecb Mon Sep 17 00:00:00 2001 From: Zeyla Hellyer Date: Sun, 17 Jun 2018 15:53:09 -0700 Subject: Remove extraneous spaces at the end of lines --- src/client/bridge/gateway/mod.rs | 4 +- src/client/bridge/gateway/shard_queuer.rs | 4 +- src/client/error.rs | 2 +- src/client/event_handler.rs | 108 +++++++++++++++--------------- 4 files changed, 59 insertions(+), 59 deletions(-) (limited to 'src/client') diff --git a/src/client/bridge/gateway/mod.rs b/src/client/bridge/gateway/mod.rs index 16f0f07..27b5c10 100644 --- a/src/client/bridge/gateway/mod.rs +++ b/src/client/bridge/gateway/mod.rs @@ -65,8 +65,8 @@ pub use self::shard_runner_message::ShardRunnerMessage; use std::{ fmt::{ - Display, - Formatter, + Display, + Formatter, Result as FmtResult }, sync::mpsc::Sender, diff --git a/src/client/bridge/gateway/shard_queuer.rs b/src/client/bridge/gateway/shard_queuer.rs index edcb6ab..07c6a2f 100644 --- a/src/client/bridge/gateway/shard_queuer.rs +++ b/src/client/bridge/gateway/shard_queuer.rs @@ -5,8 +5,8 @@ use std::{ collections::{HashMap, VecDeque}, sync::{ mpsc::{ - Receiver, - RecvTimeoutError, + Receiver, + RecvTimeoutError, Sender}, Arc }, diff --git a/src/client/error.rs b/src/client/error.rs index e1f9eb2..4858f29 100644 --- a/src/client/error.rs +++ b/src/client/error.rs @@ -2,7 +2,7 @@ use std::{ error::Error as StdError, fmt::{ Display, - Formatter, + Formatter, Result as FmtResult } }; diff --git a/src/client/event_handler.rs b/src/client/event_handler.rs index dba1024..32fdaa1 100644 --- a/src/client/event_handler.rs +++ b/src/client/event_handler.rs @@ -11,96 +11,96 @@ use ::client::bridge::gateway::event::*; /// The core trait for handling events by serenity. pub trait EventHandler { /// Dispatched when the cache gets full. - /// + /// /// Provides the cached guilds' ids. #[cfg(feature = "cache")] fn cached(&self, _ctx: Context, _guilds: Vec) {} /// Dispatched when a channel is created. - /// + /// /// Provides said channel's data. fn channel_create(&self, _ctx: Context, _channel: Arc>) {} /// Dispatched when a category is created. - /// + /// /// Provides said category's data. fn category_create(&self, _ctx: Context, _category: Arc>) {} /// Dispatched when a category is deleted. - /// + /// /// Provides said category's data. fn category_delete(&self, _ctx: Context, _category: Arc>) {} /// Dispatched when a private channel is created. - /// + /// /// Provides said channel's data. fn private_channel_create(&self, _ctx: Context, _channel: Arc>) {} /// Dispatched when a channel is deleted. - /// + /// /// Provides said channel's data. fn channel_delete(&self, _ctx: Context, _channel: Arc>) {} /// Dispatched when a pin is added, deleted. - /// + /// /// Provides said pin's data. fn channel_pins_update(&self, _ctx: Context, _pin: ChannelPinsUpdateEvent) {} /// Dispatched when a user is added to a `Group`. - /// + /// /// Provides the group's id and the user's data. fn channel_recipient_addition(&self, _ctx: Context, _group_id: ChannelId, _user: User) {} /// Dispatched when a user is removed to a `Group`. - /// + /// /// Provides the group's id and the user's data. fn channel_recipient_removal(&self, _ctx: Context, _group_id: ChannelId, _user: User) {} /// Dispatched when a channel is updated. - /// + /// /// Provides the old channel data, and the new data. #[cfg(feature = "cache")] fn channel_update(&self, _ctx: Context, _old: Option, _new: Channel) {} /// Dispatched when a channel is updated. - /// + /// /// Provides the new data. #[cfg(not(feature = "cache"))] fn channel_update(&self, _ctx: Context, _new_data: Channel) {} /// Dispatched when a user is banned from a guild. - /// + /// /// Provides the guild's id and the banned user's data. fn guild_ban_addition(&self, _ctx: Context, _guild_id: GuildId, _banned_user: User) {} /// Dispatched when a user's ban is lifted from a guild. - /// + /// /// Provides the guild's id and the lifted user's data. fn guild_ban_removal(&self, _ctx: Context, _guild_id: GuildId, _unbanned_user: User) {} - /// Dispatched when a guild is created; + /// Dispatched when a guild is created; /// or an existing guild's data is sent to us. - /// + /// /// Provides the guild's data and whether the guild is new. #[cfg(feature = "cache")] fn guild_create(&self, _ctx: Context, _guild: Guild, _is_new: bool) {} - /// Dispatched when a guild is created; + /// Dispatched when a guild is created; /// or an existing guild's data is sent to us. - /// + /// /// Provides the guild's data. #[cfg(not(feature = "cache"))] fn guild_create(&self, _ctx: Context, _guild: Guild) {} /// Dispatched when a guild is deleted. - /// + /// /// Provides the partial data of the guild sent by discord, /// and the full data from the cache, if available. #[cfg(feature = "cache")] fn guild_delete(&self, _ctx: Context, _incomplete: PartialGuild, _full: Option>>) {} /// Dispatched when a guild is deleted. - /// + /// /// Provides the partial data of the guild sent by discord. #[cfg(not(feature = "cache"))] fn guild_delete(&self, _ctx: Context, _incomplete: PartialGuild) {} @@ -108,139 +108,139 @@ pub trait EventHandler { /* the emojis were updated. */ /// Dispatched when the emojis are updated. - /// + /// /// Provides the guild's id and the new state of the emojis in the guild. fn guild_emojis_update(&self, _ctx: Context, _guild_id: GuildId, _current_state: HashMap) {} /// Dispatched when a guild's integration is added, updated or removed. - /// + /// /// Provides the guild's id. fn guild_integrations_update(&self, _ctx: Context, _guild_id: GuildId) {} /// Dispatched when a user joins a guild. - /// + /// /// Provides the guild's id and the user's member data. fn guild_member_addition(&self, _ctx: Context, _guild_id: GuildId, _new_member: Member) {} /// Dispatched when a user is removed (kicked). - /// + /// /// Provides the guild's id, the user's data, and the user's member data if available. #[cfg(feature = "cache")] fn guild_member_removal(&self, _ctx: Context, _guild: GuildId, _user: User, _member_data_if_available: Option) {} /// Dispatched when a user is removed (kicked). - /// + /// /// Provides the guild's id, the user's data. #[cfg(not(feature = "cache"))] fn guild_member_removal(&self, _ctx: Context, _guild_id: GuildId, _kicked: User) {} /// Dispatched when a member is updated (e.g their nickname is updated) - /// + /// /// Provides the member's old data (if available) and the new data. #[cfg(feature = "cache")] fn guild_member_update(&self, _ctx: Context, _old_if_available: Option, _new: Member) {} /// Dispatched when a member is updated (e.g their nickname is updated) - /// + /// /// Provides the new data. #[cfg(not(feature = "cache"))] fn guild_member_update(&self, _ctx: Context, _new: GuildMemberUpdateEvent) {} /// Dispatched when the data for offline members was requested. - /// - /// Provides the guild's id and the data. + /// + /// Provides the guild's id and the data. fn guild_members_chunk(&self, _ctx: Context, _guild_id: GuildId, _offline_members: HashMap) {} /// Dispatched when a role is created. - /// + /// /// Provides the guild's id and the new role's data. fn guild_role_create(&self, _ctx: Context, _guild_id: GuildId, _new: Role) {} /// Dispatched when a role is deleted. - /// + /// /// Provides the guild's id, the role's id and its data if available. #[cfg(feature = "cache")] fn guild_role_delete(&self, _ctx: Context, _guild_id: GuildId, _removed_role_id: RoleId, _removed_role_data_if_available: Option) {} /// Dispatched when a role is deleted. - /// + /// /// Provides the guild's id, the role's id. #[cfg(not(feature = "cache"))] fn guild_role_delete(&self, _ctx: Context, _guild_id: GuildId, _removed_role_id: RoleId) {} /// Dispatched when a role is updated. - /// + /// /// Provides the guild's id, the role's old (if available) and new data. #[cfg(feature = "cache")] fn guild_role_update(&self, _ctx: Context, _guild_id: GuildId, _old_data_if_available: Option, _new: Role) {} /// Dispatched when a role is updated. - /// + /// /// Provides the guild's id and the role's new data. #[cfg(not(feature = "cache"))] fn guild_role_update(&self, _ctx: Context, _guild_id: GuildId, _new_data: Role) {} /// Dispatched when a guild became unavailable. - /// - /// Provides the guild's id. + /// + /// Provides the guild's id. fn guild_unavailable(&self, _ctx: Context, _guild_id: GuildId) {} /// Dispatched when the guild is updated. - /// + /// /// Provides the guild's old full data (if available) and the new, albeit partial data. #[cfg(feature = "cache")] fn guild_update(&self, _ctx: Context, _old_data_if_available: Option>>, _new_but_incomplete: PartialGuild) {} /// Dispatched when the guild is updated. - /// + /// /// Provides the guild's new, albeit partial data. #[cfg(not(feature = "cache"))] fn guild_update(&self, _ctx: Context, _new_but_incomplete_data: PartialGuild) {} /// Dispatched when a message is created. - /// + /// /// Provides the message's data. fn message(&self, _ctx: Context, _new_message: Message) {} /// Dispatched when a message is deleted. - /// + /// /// Provides the channel's id and the message's id. fn message_delete(&self, _ctx: Context, _channel_id: ChannelId, _deleted_message_id: MessageId) {} /// Dispatched when multiple messages were deleted at once. - /// + /// /// Provides the channel's id and the deleted messages' ids. fn message_delete_bulk(&self, _ctx: Context, _channel_id: ChannelId, _multiple_deleted_messages_ids: Vec) {} /// Dispatched when a new reaction is attached to a message. - /// + /// /// Provides the reaction's data. fn reaction_add(&self, _ctx: Context, _add_reaction: Reaction) {} /// Dispatched when a reaction is dettached from a message. - /// + /// /// Provides the reaction's data. fn reaction_remove(&self, _ctx: Context, _removed_reaction: Reaction) {} /// Dispatched when all reactions of a message are dettached from a message. - /// + /// /// Provides the channel's id and the message's id. fn reaction_remove_all(&self, _ctx: Context, _channel_id: ChannelId, _removed_from_message_id: MessageId) {} /// Dispatched when a message is updated. - /// + /// /// Provides the new data of the message. fn message_update(&self, _ctx: Context, _new_data: MessageUpdateEvent) {} fn presence_replace(&self, _ctx: Context, _: Vec) {} /// Dispatched when a user's presence is updated (e.g off -> on). - /// + /// /// Provides the presence's new data. fn presence_update(&self, _ctx: Context, _new_data: PresenceUpdateEvent) {} /// Dispatched upon startup. - /// + /// /// Provides data about the bot and the guilds it's in. fn ready(&self, _ctx: Context, _data_about_bot: Ready) {} @@ -248,7 +248,7 @@ pub trait EventHandler { fn resume(&self, _ctx: Context, _: ResumedEvent) {} /// Dispatched when a shard's connection stage is updated - /// + /// /// Provides the context of the shard and the event information about the update. fn shard_stage_update(&self, _ctx: Context, _: ShardStageUpdateEvent) {} @@ -256,35 +256,35 @@ pub trait EventHandler { fn typing_start(&self, _ctx: Context, _: TypingStartEvent) {} /// Dispatched when an unknown event was sent from discord. - /// + /// /// Provides the event's name and its unparsed data. fn unknown(&self, _ctx: Context, _name: String, _raw: Value) {} /// Dispatched when the bot's data is updated. - /// + /// /// Provides the old and new data. #[cfg(feature = "cache")] fn user_update(&self, _ctx: Context, _old_data: CurrentUser, _new: CurrentUser) {} /// Dispatched when the bot's data is updated. - /// + /// /// Provides the new data. #[cfg(not(feature = "cache"))] fn user_update(&self, _ctx: Context, _new_data: CurrentUser) {} /// Dispatched when a guild's voice server was updated (or changed to another one). - /// + /// /// Provides the voice server's data. fn voice_server_update(&self, _ctx: Context, _: VoiceServerUpdateEvent) {} /// Dispatched when a user joins, leaves or moves a voice channel. - /// - /// Provides the guild's id (if available) and + /// + /// Provides the guild's id (if available) and /// the new state of the guild's voice channels. fn voice_state_update(&self, _ctx: Context, _: Option, _: VoiceState) {} /// Dispatched when a guild's webhook is updated. - /// + /// /// Provides the guild's id and the channel's id the webhook belongs in. fn webhook_update(&self, _ctx: Context, _guild_id: GuildId, _belongs_to_channel_id: ChannelId) {} } -- cgit v1.2.3