diff options
| author | Zeyla Hellyer <[email protected]> | 2017-05-14 21:50:17 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-05-22 16:44:46 -0700 |
| commit | 9dae9e67b992cea4c18f1c685f5185abd9428887 (patch) | |
| tree | 0021934890c7e48183b6a98b65601793dcbc8376 /src/utils | |
| parent | Remove more remaining selfbot support (diff) | |
| download | serenity-9dae9e67b992cea4c18f1c685f5185abd9428887.tar.xz serenity-9dae9e67b992cea4c18f1c685f5185abd9428887.zip | |
Reasonably derive Debug on items
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/builder/create_embed.rs | 7 | ||||
| -rw-r--r-- | src/utils/builder/create_invite.rs | 1 | ||||
| -rw-r--r-- | src/utils/builder/create_message.rs | 1 | ||||
| -rw-r--r-- | src/utils/builder/edit_channel.rs | 2 | ||||
| -rw-r--r-- | src/utils/builder/edit_guild.rs | 2 | ||||
| -rw-r--r-- | src/utils/builder/edit_member.rs | 2 | ||||
| -rw-r--r-- | src/utils/builder/edit_profile.rs | 2 | ||||
| -rw-r--r-- | src/utils/builder/edit_role.rs | 1 | ||||
| -rw-r--r-- | src/utils/builder/execute_webhook.rs | 1 | ||||
| -rw-r--r-- | src/utils/builder/get_messages.rs | 9 | ||||
| -rw-r--r-- | src/utils/message_builder.rs | 7 |
11 files changed, 15 insertions, 20 deletions
diff --git a/src/utils/builder/create_embed.rs b/src/utils/builder/create_embed.rs index 7c1c606..457a960 100644 --- a/src/utils/builder/create_embed.rs +++ b/src/utils/builder/create_embed.rs @@ -33,6 +33,7 @@ use ::utils::Colour; /// [`Context::send_message`]: ../../client/struct.Context.html#method.send_message /// [`Embed`]: ../../model/struct.Embed.html /// [`ExecuteWebhook::embeds`]: struct.ExecuteWebhook.html#method.embeds +#[derive(Clone, Debug)] pub struct CreateEmbed(pub Map<String, Value>); impl CreateEmbed { @@ -271,7 +272,7 @@ impl From<Embed> for CreateEmbed { /// [`Embed`]: ../../model/struct.Embed.html /// [`CreateEmbed::author`]: struct.CreateEmbed.html#method.author /// [`name`]: #method.name -#[derive(Default)] +#[derive(Clone, Debug, Default)] pub struct CreateEmbedAuthor(pub Map<String, Value>); impl CreateEmbedAuthor { @@ -305,6 +306,7 @@ impl CreateEmbedAuthor { /// /// [`Embed`]: ../../model/struct.Embed.html /// [`CreateEmbed::field`]: struct.CreateEmbed.html#method.field +#[derive(Clone, Debug)] pub struct CreateEmbedField(pub Map<String, Value>); impl CreateEmbedField { @@ -348,7 +350,7 @@ impl Default for CreateEmbedField { /// /// [`Embed`]: ../../model/struct.Embed.html /// [`CreateEmbed::footer`]: struct.CreateEmbed.html#method.footer -#[derive(Default)] +#[derive(Clone, Debug, Default)] pub struct CreateEmbedFooter(pub Map<String, Value>); impl CreateEmbedFooter { @@ -367,6 +369,7 @@ impl CreateEmbedFooter { } } +#[derive(Clone, Debug)] pub struct Timestamp { pub ts: String, } diff --git a/src/utils/builder/create_invite.rs b/src/utils/builder/create_invite.rs index d7595cd..6ff2a67 100644 --- a/src/utils/builder/create_invite.rs +++ b/src/utils/builder/create_invite.rs @@ -28,6 +28,7 @@ use ::internal::prelude::*; /// /// [`Context::create_invite`]: ../../client/struct.Context.html#method.create_invite /// [`RichInvite`]: ../../model/struct.Invite.html +#[derive(Clone, Debug)] pub struct CreateInvite(pub JsonMap); impl CreateInvite { diff --git a/src/utils/builder/create_message.rs b/src/utils/builder/create_message.rs index 2dbbd79..5c3b6eb 100644 --- a/src/utils/builder/create_message.rs +++ b/src/utils/builder/create_message.rs @@ -36,6 +36,7 @@ use ::internal::prelude::*; /// [`content`]: #method.content /// [`embed`]: #method.embed /// [`rest::send_message`]: ../../client/rest/fn.send_message.html +#[derive(Clone, Debug)] pub struct CreateMessage(pub Map<String, Value>); impl CreateMessage { diff --git a/src/utils/builder/edit_channel.rs b/src/utils/builder/edit_channel.rs index 2fa61a5..4d0955e 100644 --- a/src/utils/builder/edit_channel.rs +++ b/src/utils/builder/edit_channel.rs @@ -23,7 +23,7 @@ use ::internal::prelude::*; /// [`Context::edit_channel`]: ../client/struct.Context.html#method.edit_channel /// [`GuildChannel`]: ../model/struct.GuildChannel.html /// [`GuildChannel::edit`]: ../model/struct.GuildChannel.html#method.edit -#[derive(Default)] +#[derive(Clone, Debug, Default)] pub struct EditChannel(pub JsonMap); impl EditChannel { diff --git a/src/utils/builder/edit_guild.rs b/src/utils/builder/edit_guild.rs index bd94efa..e423fc2 100644 --- a/src/utils/builder/edit_guild.rs +++ b/src/utils/builder/edit_guild.rs @@ -11,7 +11,7 @@ use ::model::{ChannelId, Region, UserId, VerificationLevel}; /// [`Guild`]: ../../model/struct.Guild.html /// [`LiveGuild::edit`]: ../../model/struct.LiveGuild.html#method.edit /// [Manage Guild]: ../../model/permissions/constant.MANAGE_GUILD.html -#[derive(Default)] +#[derive(Clone, Debug, Default)] pub struct EditGuild(pub Map<String, Value>); impl EditGuild { diff --git a/src/utils/builder/edit_member.rs b/src/utils/builder/edit_member.rs index 58f260a..af35bf9 100644 --- a/src/utils/builder/edit_member.rs +++ b/src/utils/builder/edit_member.rs @@ -7,7 +7,7 @@ use ::internal::prelude::*; /// [`Context::edit_member`]: ../../client/struct.Context.html#method.edit_member /// [`Member`]: ../../model/struct.Member.html /// [`Member::edit`]: ../../model/struct.Member.html#method.edit -#[derive(Default)] +#[derive(Clone, Debug, Default)] pub struct EditMember(pub JsonMap); impl EditMember { diff --git a/src/utils/builder/edit_profile.rs b/src/utils/builder/edit_profile.rs index 680a371..64bd7a9 100644 --- a/src/utils/builder/edit_profile.rs +++ b/src/utils/builder/edit_profile.rs @@ -4,7 +4,7 @@ use ::internal::prelude::*; /// with [`Context::edit_profile`]. /// /// [`Context::edit_profile`]: ../../client/struct.Context.html#method.edit_profile -#[derive(Default)] +#[derive(Clone, Debug, Default)] pub struct EditProfile(pub JsonMap); impl EditProfile { diff --git a/src/utils/builder/edit_role.rs b/src/utils/builder/edit_role.rs index 18af85d..6a44912 100644 --- a/src/utils/builder/edit_role.rs +++ b/src/utils/builder/edit_role.rs @@ -31,6 +31,7 @@ use ::model::{Permissions, Role, permissions}; /// [`Guild::create_role`]: ../../model/struct.Guild.html#method.create_role /// [`Role`]: ../../model/struct.Role.html /// [`Role::edit`]: ../../model/struct.Role.html#method.edit +#[derive(Clone, Debug)] pub struct EditRole(pub JsonMap); impl EditRole { diff --git a/src/utils/builder/execute_webhook.rs b/src/utils/builder/execute_webhook.rs index 5e79f31..ee898de 100644 --- a/src/utils/builder/execute_webhook.rs +++ b/src/utils/builder/execute_webhook.rs @@ -52,6 +52,7 @@ use ::internal::prelude::*; /// [`Webhook`]: ../../model/struct.Webhook.html /// [`Webhook::execute`]: ../../model/struct.Webhook.html#method.execute /// [`execute_webhook`]: ../../client/rest/fn.execute_webhook.html +#[derive(Clone, Debug)] pub struct ExecuteWebhook(pub JsonMap); impl ExecuteWebhook { diff --git a/src/utils/builder/get_messages.rs b/src/utils/builder/get_messages.rs index d5088e8..cc4658c 100644 --- a/src/utils/builder/get_messages.rs +++ b/src/utils/builder/get_messages.rs @@ -1,5 +1,4 @@ use std::collections::BTreeMap; -use std::default::Default; use ::model::MessageId; /// Builds a request for a request to the API to retrieve messages. @@ -22,6 +21,7 @@ use ::model::MessageId; /// [`Client::get_messages`] for examples. /// /// [`Client::get_messages`]: ../../client/struct.Client.html#method.get_messages +#[derive(Clone, Debug, Default)] pub struct GetMessages(pub BTreeMap<String, u64>); impl GetMessages { @@ -73,10 +73,3 @@ impl GetMessages { self } } - -impl Default for GetMessages { - /// Creates a builder with no default values. - fn default() -> GetMessages { - GetMessages(BTreeMap::default()) - } -} diff --git a/src/utils/message_builder.rs b/src/utils/message_builder.rs index 995be87..a6e7e0b 100644 --- a/src/utils/message_builder.rs +++ b/src/utils/message_builder.rs @@ -28,6 +28,7 @@ use ::model::{ChannelId, Emoji, Mentionable, RoleId, UserId}; /// [`build`]: #method.build /// [`emoji`]: #method.emoji /// [`user`]: #method.user +#[derive(Clone, Debug, Default)] pub struct MessageBuilder(pub String); impl MessageBuilder { @@ -290,12 +291,6 @@ impl fmt::Display for MessageBuilder { } } -impl Default for MessageBuilder { - fn default() -> MessageBuilder { - MessageBuilder(String::default()) - } -} - fn normalize(text: &str) -> String { // Remove invite links and popular scam websites, mostly to prevent the // current user from triggering various ad detectors and prevent embeds. |