diff options
| author | acdenisSK <[email protected]> | 2017-11-04 20:06:40 +0100 |
|---|---|---|
| committer | acdenisSK <[email protected]> | 2017-11-04 20:06:40 +0100 |
| commit | 0bd519f4ef9784d0fb5663d74db0d567f0bb1ae5 (patch) | |
| tree | cc2a6f44e97e42420507964dab4662fcccd9beb3 /src/builder | |
| parent | Fix Help-Commands to list all eligible commands in DMs. (#212) (diff) | |
| parent | Bump to v0.4.3 (diff) | |
| download | serenity-0bd519f4ef9784d0fb5663d74db0d567f0bb1ae5.tar.xz serenity-0bd519f4ef9784d0fb5663d74db0d567f0bb1ae5.zip | |
Merge v0.4.3
Diffstat (limited to 'src/builder')
| -rw-r--r-- | src/builder/create_embed.rs | 6 | ||||
| -rw-r--r-- | src/builder/create_invite.rs | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/builder/create_embed.rs b/src/builder/create_embed.rs index e22fc82..7c4d3d6 100644 --- a/src/builder/create_embed.rs +++ b/src/builder/create_embed.rs @@ -235,9 +235,15 @@ impl CreateEmbed { /// struct Handler; /// /// impl EventHandler for Handler { +<<<<<<< HEAD /// fn guild_member_addition(&self, _: Context, guild_id: GuildId, member: Member) { /// use serenity::client::CACHE; /// let cache = CACHE.read(); +======= + /// fn on_guild_member_addition(&self, _: Context, guild_id: GuildId, member: Member) { + /// use serenity::CACHE; + /// let cache = CACHE.read().unwrap(); +>>>>>>> v0.4.3 /// /// if let Some(guild) = cache.guild(guild_id) { /// let guild = guild.read(); diff --git a/src/builder/create_invite.rs b/src/builder/create_invite.rs index 138e5c7..0b05b66 100644 --- a/src/builder/create_invite.rs +++ b/src/builder/create_invite.rs @@ -19,8 +19,8 @@ use internal::prelude::*; /// struct Handler; /// /// impl EventHandler for Handler { -/// fn message(&self, _: Context, msg: Message) { -/// use serenity::client::CACHE; +/// fn on_message(&self, _: Context, msg: Message) { +/// use serenity::CACHE; /// if msg.content == "!createinvite" { /// let channel = match CACHE.read().guild_channel(msg.channel_id) { /// Some(channel) => channel, @@ -76,7 +76,7 @@ impl CreateInvite { /// Create an invite with a max age of `3600` seconds, or 1 hour: /// /// ```rust,no_run - /// # use serenity::client::CACHE; + /// # use serenity::CACHE; /// # use serenity::model::ChannelId; /// # use std::error::Error; /// # @@ -109,7 +109,7 @@ impl CreateInvite { /// Create an invite with a max use limit of `5`: /// /// ```rust,no_run - /// # use serenity::client::CACHE; + /// # use serenity::CACHE; /// # use serenity::model::ChannelId; /// # use std::error::Error; /// # @@ -140,7 +140,7 @@ impl CreateInvite { /// Create an invite which is temporary: /// /// ```rust,no_run - /// # use serenity::client::CACHE; + /// # use serenity::CACHE; /// # use serenity::model::ChannelId; /// # use std::error::Error; /// # @@ -171,7 +171,7 @@ impl CreateInvite { /// Create an invite which is unique: /// /// ```rust,no_run - /// # use serenity::client::CACHE; + /// # use serenity::CACHE; /// # use serenity::model::ChannelId; /// # use std::error::Error; /// # |