Fix doc tests

3 files changed, 94 insertions, 81 deletions

diff --git a/src/builder/create_embed.rs b/src/builder/create_embed.rs
index 17f164b..6d1d384 100644
--- a/src/builder/create_embed.rs
+++ b/src/builder/create_embed.rs
@@ -193,18 +193,22 @@ impl CreateEmbed {
     /// Passing a string timestamp:
     ///
     /// ```rust,no_run
-    /// # use serenity::Client;
-    /// #
-    /// # let mut client = Client::new("");
-    /// #
-    /// client.on_message(|_, msg| {
-    ///     if msg.content == "~embed" {
-    ///         let _ = msg.channel_id.send_message(|m| m
-    ///             .embed(|e| e
-    ///                 .title("hello")
-    ///                 .timestamp("2004-06-08T16:04:23")));
+    /// # use serenity::prelude::*;
+    /// # use serenity::model::*;
+    /// # 
+    /// struct Handler;
+    /// impl EventHandler for Handler {
+    ///     fn on_message(&self, _: Context, msg: Message) {
+    ///         if msg.content == "~embed" {
+    ///             let _ = msg.channel_id.send_message(|m| m
+    ///              .embed(|e| e
+    ///                     .title("hello")
+    ///                     .timestamp("2004-06-08T16:04:23")));
+    ///         }
     ///     }
-    /// });
+    /// }
+    ///
+    /// let mut client = Client::new("token", Handler); client.start().unwrap();
     /// ```
     ///
     /// Creating a join-log:
@@ -212,41 +216,44 @@ impl CreateEmbed {
     /// Note: this example isn't efficient and is for demonstrative purposes.
     ///
     /// ```rust,no_run
-    /// # use serenity::Client;
+    /// # use serenity::prelude::*;
+    /// # use serenity::model::*;
     /// #
-    /// # let mut client = Client::new("");
-    /// #
-    /// use serenity::CACHE;
-    ///
-    /// client.on_guild_member_add(|_, guild_id, member| {
-    ///     let cache = CACHE.read().unwrap();
+    /// struct Handler;
+    /// impl EventHandler for Handler {
+    ///     fn on_guild_member_addition(&self, _: Context, guild_id: GuildId, member: Member) {
+    ///         use serenity::client::CACHE;
+    ///         let cache = CACHE.read().unwrap();
     ///
-    ///     if let Some(guild) = cache.guild(guild_id) {
-    ///         let guild = guild.read().unwrap();
+    ///         if let Some(guild) = cache.guild(guild_id) {
+    ///             let guild = guild.read().unwrap();
     ///
-    ///         let channel_search = guild
-    ///             .channels
-    ///             .values()
-    ///             .find(|c| c.read().unwrap().name == "join-log");
+    ///             let channel_search = guild
+    ///                 .channels
+    ///                 .values()
+    ///                 .find(|c| c.read().unwrap().name == "join-log");
     ///
-    ///         if let Some(channel) = channel_search {
-    ///             let user = member.user.read().unwrap();
+    ///             if let Some(channel) = channel_search {
+    ///                 let user = member.user.read().unwrap();
     ///
-    ///             let _ = channel.read().unwrap().send_message(|m| m
-    ///                 .embed(|e| {
-    ///                     let mut e = e
-    ///                         .author(|a| a.icon_url(&user.face()).name(&user.name))
-    ///                         .title("Member Join");
+    ///                 let _ = channel.read().unwrap().send_message(|m| m
+    ///                     .embed(|e| {
+    ///                         let mut e = e
+    ///                             .author(|a| a.icon_url(&user.face()).name(&user.name))
+    ///                             .title("Member Join");
     ///
-    ///                     if let Some(ref joined_at) = member.joined_at {
-    ///                         e = e.timestamp(joined_at);
-    ///                     }
+    ///                         if let Some(ref joined_at) = member.joined_at {
+    ///                             e = e.timestamp(joined_at);
+    ///                         }
     ///
-    ///                     e
-    ///                 }));
+    ///                         e
+    ///                     }));
+    ///             }
     ///         }
     ///     }
-    /// });
+    /// }
+    ///
+    /// let mut client = Client::new("token", Handler); client.start().unwrap();
     /// ```
     pub fn timestamp<T: Into<Timestamp>>(mut self, timestamp: T) -> Self {
         self.0.insert("timestamp".to_owned(), Value::String(timestamp.into().ts));
diff --git a/src/builder/create_invite.rs b/src/builder/create_invite.rs
index 62f8657..8253205 100644
--- a/src/builder/create_invite.rs
+++ b/src/builder/create_invite.rs
@@ -12,44 +12,47 @@ use ::internal::prelude::*;
 /// Create an invite with a max age of 3600 seconds and 10 max uses:
 ///
 /// ```rust,no_run
-/// # use serenity::Client;
-/// #
-/// # let mut client = Client::new("");
-/// #
-/// use serenity::client::CACHE;
+/// # use serenity::prelude::*;
+/// # use serenity::model::*;
+/// 
+/// struct Handler;
+/// 
+/// impl EventHandler for Handler {
+///     fn on_message(&self, _: Context, msg: Message) {
+///         use serenity::client::CACHE;
+///         if msg.content == "!createinvite" {
+///             let channel = match CACHE.read().unwrap().guild_channel(msg.channel_id) {
+///                 Some(channel) => channel,
+///                 None => {
+///                     let _ = msg.channel_id.say("Error creating invite");
 ///
-/// client.on_message(|_, msg| {
-///     if msg.content == "!createinvite" {
-///         let channel = match CACHE.read().unwrap().guild_channel(msg.channel_id) {
-///             Some(channel) => channel,
-///             None => {
-///                 let _ = msg.channel_id.say("Error creating invite");
+///                     return;
+///                 },
+///             };
 ///
-///                 return;
-///             },
-///         };
+///             let reader = channel.read().unwrap();
 ///
-///         let reader = channel.read().unwrap();
+///             let invite = match reader.create_invite(|i| i.max_age(3600).max_uses(10)) {
+///                 Ok(invite) => invite,
+///                 Err(why) => {
+///                     println!("Err creating invite: {:?}", why);
 ///
-///         let invite = match reader.create_invite(|i| i.max_age(3600).max_uses(10)) {
-///             Ok(invite) => invite,
-///             Err(why) => {
-///                 println!("Err creating invite: {:?}", why);
+///                     if let Err(why) = msg.channel_id.say("Error creating invite") {
+///                         println!("Err sending err msg: {:?}", why);
+///                     }
 ///
-///                 if let Err(why) = msg.channel_id.say("Error creating invite") {
-///                     println!("Err sending err msg: {:?}", why);
-///                 }
+///                     return;
+///                 },
+///             };
 ///
-///                 return;
-///             },
-///         };
+///             drop(reader);
 ///
-///         drop(reader);
-///
-///         let content = format!("Here's your invite: {}", invite.url());
-///         let _ = msg.channel_id.say(&content);
-///     }
-/// });
+///             let content = format!("Here's your invite: {}", invite.url());
+///             let _ = msg.channel_id.say(&content);
+///         } 
+///     }   
+/// }
+/// let mut client = Client::new("token", Handler); client.start().unwrap();
 /// ```
 ///
 /// [`GuildChannel::create_invite`]: ../model/struct.GuildChannel.html#method.create_invite
diff --git a/src/builder/edit_profile.rs b/src/builder/edit_profile.rs
index 7a3a522..2b54f68 100644
--- a/src/builder/edit_profile.rs
+++ b/src/builder/edit_profile.rs
@@ -19,23 +19,26 @@ impl EditProfile {
     /// image from a file and return its contents in base64-encoded form:
     ///
     /// ```rust,no_run
-    /// # use serenity::Client;
+    /// # use serenity::prelude::*;
+    /// # use serenity::model::*;
     /// #
-    /// # let mut client = Client::new("");
-    /// #
-    /// # client.on_message(|context, _| {
-    /// #
-    /// use serenity::utils;
+    /// # struct Handler;
+    /// # impl EventHandler for Handler {
+    ///    # fn on_message(&self, context: Context, _: Message) {
+    ///         use serenity::utils;
     ///
-    /// // assuming a `context` has been bound
+    ///         // assuming a `context` has been bound
     ///
-    /// let base64 = utils::read_image("./my_image.jpg")
-    ///     .expect("Failed to read image");
+    ///         let base64 = utils::read_image("./my_image.jpg")
+    ///         .expect("Failed to read image");
     ///
-    /// let _ = context.edit_profile(|profile| {
-    ///     profile.avatar(Some(&base64))
-    /// });
-    /// # });
+    ///         let _ = context.edit_profile(|profile| {
+    ///             profile.avatar(Some(&base64))
+    ///         });
+    ///    # }
+    /// }
+
+    /// # let mut client = Client::new("token", Handler); client.start().unwrap();
     /// ```
     ///
     /// [`utils::read_image`]: ../fn.read_image.html