Fix doc tests

3 files changed, 83 insertions, 71 deletions

diff --git a/src/model/channel/attachment.rs b/src/model/channel/attachment.rs
index 015c18e..2238174 100644
--- a/src/model/channel/attachment.rs
+++ b/src/model/channel/attachment.rs
@@ -46,52 +46,55 @@ impl Attachment {
     /// Download all of the attachments associated with a [`Message`]:
     ///
     /// ```rust,no_run
-    /// use serenity::Client;
+    /// use serenity::prelude::*;
+    /// use serenity::model::*;
     /// use std::env;
     /// use std::fs::File;
     /// use std::io::Write;
     /// use std::path::Path;
     ///
-    /// let token = env::var("DISCORD_TOKEN").expect("token in environment");
-    /// let mut client = Client::new(&token);
+    /// struct Handler;
     ///
-    /// client.on_message(|_, message| {
-    ///     for attachment in message.attachments {
-    ///         let content = match attachment.download() {
-    ///             Ok(content) => content,
-    ///             Err(why) => {
-    ///                 println!("Error downloading attachment: {:?}", why);
-    ///                 let _ = message.channel_id.say("Error downloading attachment");
     ///
-    ///                 return;
-    ///             },
-    ///         };
+    /// impl EventHandler for Handler {
+    ///     fn on_message(&self, _: Context, message: Message) {
+    ///         for attachment in message.attachments {
+    ///             let content = match attachment.download() {
+    ///                 Ok(content) => content,
+    ///                 Err(why) => {
+    ///                     println!("Error downloading attachment: {:?}", why);
+    ///                     let _ = message.channel_id.say("Error downloading attachment");
     ///
-    ///         let mut file = match File::create(&attachment.filename) {
-    ///             Ok(file) => file,
-    ///             Err(why) => {
-    ///                 println!("Error creating file: {:?}", why);
-    ///                 let _ = message.channel_id.say("Error creating file");
+    ///                     return;
+    ///                 },
+    ///             };
     ///
-    ///                 return;
-    ///             },
-    ///         };
+    ///             let mut file = match File::create(&attachment.filename) {
+    ///                 Ok(file) => file,
+    ///                 Err(why) => {
+    ///                     println!("Error creating file: {:?}", why);
+    ///                     let _ = message.channel_id.say("Error creating file");
     ///
-    ///         if let Err(why) = file.write(&content) {
-    ///             println!("Error writing to file: {:?}", why);
+    ///                     return;
+    ///                 },
+    ///             };
     ///
-    ///             return;
-    ///         }
+    ///             if let Err(why) = file.write(&content) {
+    ///                 println!("Error writing to file: {:?}", why);
     ///
-    ///         let _ = message.channel_id.say(&format!("Saved {:?}", attachment.filename));
-    ///     }
-    /// });
+    ///                 return;
+    ///             }
     ///
-    /// client.on_ready(|_context, ready| {
-    ///     println!("{} is connected!", ready.user.name);
-    /// });
+    ///             let _ = message.channel_id.say(&format!("Saved {:?}", attachment.filename));
+    ///         }
+    ///     }
     ///
-    /// let _ = client.start();
+    ///     fn on_ready(&self, _: Context, ready: Ready) {
+    ///         println!("{} is connected!", ready.user.name);   
+    ///     }
+    /// }
+    /// let token = env::var("DISCORD_TOKEN").expect("token in environment");
+    /// let mut client = Client::new(&token, Handler); client.start().unwrap();
     /// ```
     ///
     /// # Errors
diff --git a/src/model/channel/guild_channel.rs b/src/model/channel/guild_channel.rs
index 09e76a4..15a068e 100644
--- a/src/model/channel/guild_channel.rs
+++ b/src/model/channel/guild_channel.rs
@@ -413,22 +413,25 @@ impl GuildChannel {
     /// channel:
     ///
     /// ```rust,no_run
-    /// # use serenity::Client;
-    /// #
-    /// # let mut client = Client::new("");
-    /// #
+    /// use serenity::prelude::*;
+    /// use serenity::model::*;
+    /// struct Handler;
+    /// 
     /// use serenity::CACHE;
+    /// 
+    /// impl EventHandler for Handler {
+    ///     fn on_message(&self, _: Context, msg: Message) {
+    ///         let channel = match CACHE.read().unwrap().guild_channel(msg.channel_id) {
+    ///             Some(channel) => channel,
+    ///             None => return,
+    ///         };
     ///
-    /// client.on_message(|_, msg| {
-    ///     let channel = match CACHE.read().unwrap().guild_channel(msg.channel_id) {
-    ///         Some(channel) => channel,
-    ///         None => return,
-    ///     };
-    ///
-    ///     let permissions = channel.read().unwrap().permissions_for(&msg.author).unwrap();
+    ///         let permissions = channel.read().unwrap().permissions_for(&msg.author).unwrap();
     ///
-    ///     println!("The user's permissions: {:?}", permissions);
-    /// });
+    ///         println!("The user's permissions: {:?}", permissions);
+    ///     }
+    /// }
+    /// let mut client = Client::new("token", Handler); client.start().unwrap();
     /// ```
     ///
     /// Check if the current user has the [Attach Files] and [Send Messages]
@@ -436,38 +439,42 @@ impl GuildChannel {
     /// for demonstrative purposes):
     ///
     /// ```rust,no_run
-    /// # use serenity::Client;
-    /// #
-    /// # let mut client = Client::new("");
-    /// #
+    /// use serenity::prelude::*;
+    /// use serenity::model::*;
     /// use serenity::CACHE;
     /// use serenity::model::permissions;
     /// use std::fs::File;
     ///
-    /// client.on_message(|_, msg| {
-    ///     let channel = match CACHE.read().unwrap().guild_channel(msg.channel_id) {
-    ///         Some(channel) => channel,
-    ///         None => return,
-    ///     };
+    /// struct Handler;
     ///
-    ///     let current_user_id = CACHE.read().unwrap().user.id;
-    ///     let permissions = channel.read().unwrap().permissions_for(current_user_id).unwrap();
+    /// impl EventHandler for Handler {
+    ///     fn on_message(&self, _: Context, msg: Message) {
+    ///         let channel = match CACHE.read().unwrap().guild_channel(msg.channel_id) {
+    ///             Some(channel) => channel,
+    ///             None => return,
+    ///         };
     ///
-    ///     if !permissions.contains(permissions::ATTACH_FILES | permissions::SEND_MESSAGES) {
-    ///         return;
-    ///     }
-    ///
-    ///     let file = match File::open("./cat.png") {
-    ///         Ok(file) => file,
-    ///         Err(why) => {
-    ///             println!("Err opening file: {:?}", why);
+    ///         let current_user_id = CACHE.read().unwrap().user.id;
+    ///         let permissions = channel.read().unwrap().permissions_for(current_user_id).unwrap();
     ///
+    ///         if !permissions.contains(permissions::ATTACH_FILES | permissions::SEND_MESSAGES) {
     ///             return;
-    ///         },
-    ///     };
+    ///         }
+    ///
+    ///         let file = match File::open("./cat.png") {
+    ///             Ok(file) => file,
+    ///             Err(why) => {
+    ///                 println!("Err opening file: {:?}", why);
+    ///
+    ///                 return;
+    ///             },
+    ///         };
+    ///
+    ///         let _ = msg.channel_id.send_file(file, "cat.png", |m| m.content("here's a cat"));
+    ///     }        
+    /// }
     ///
-    ///     let _ = msg.channel_id.send_file(file, "cat.png", |m| m.content("here's a cat"));
-    /// });
+    /// let mut client = Client::new("token", Handler); client.start().unwrap();
     /// ```
     ///
     /// # Errors
diff --git a/src/model/channel/message.rs b/src/model/channel/message.rs
index 3fa9de4..6314cae 100644
--- a/src/model/channel/message.rs
+++ b/src/model/channel/message.rs
@@ -80,10 +80,12 @@ impl Message {
     /// ```rust,no_run
     /// # #[macro_use] extern crate serenity;
     /// #
-    /// # use serenity::Client;
-    /// #
     /// # fn main() {
-    /// #     let mut client = Client::new("");
+    /// #   use serenity::prelude::*;
+    /// #   struct Handler;
+    /// #
+    /// #   impl EventHandler for Handler {}
+    /// #   let mut client = Client::new("token", Handler);
     /// #
     /// use serenity::model::Channel;
     ///