Make the Client return a Result

The client now returns a Result in preparation of a future commit.

Upgrade path:

Handle the case of an error via pattern matching, or unwrap the Result.

18 files changed, 126 insertions, 67 deletions

diff --git a/src/builder/create_embed.rs b/src/builder/create_embed.rs
index 46d9873..e22fc82 100644
--- a/src/builder/create_embed.rs
+++ b/src/builder/create_embed.rs
@@ -207,6 +207,7 @@ impl CreateEmbed {
     /// # use serenity::model::*;
     /// #
     /// struct Handler;
+    ///
     /// impl EventHandler for Handler {
     ///     fn message(&self, _: Context, msg: Message) {
     ///         if msg.content == "~embed" {
@@ -218,7 +219,9 @@ impl CreateEmbed {
     ///     }
     /// }
     ///
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     ///
     /// Creating a join-log:
@@ -230,6 +233,7 @@ impl CreateEmbed {
     /// # use serenity::model::*;
     /// #
     /// struct Handler;
+    ///
     /// impl EventHandler for Handler {
     ///     fn guild_member_addition(&self, _: Context, guild_id: GuildId, member: Member) {
     ///         use serenity::client::CACHE;
@@ -263,7 +267,9 @@ impl CreateEmbed {
     ///     }
     /// }
     ///
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     pub fn timestamp<T: Into<Timestamp>>(mut self, timestamp: T) -> Self {
         self.0
diff --git a/src/builder/create_invite.rs b/src/builder/create_invite.rs
index d4e0c25..138e5c7 100644
--- a/src/builder/create_invite.rs
+++ b/src/builder/create_invite.rs
@@ -53,7 +53,10 @@ use internal::prelude::*;
 ///         }
 ///     }
 /// }
-/// let mut client = Client::new("token", Handler); client.start().unwrap();
+///
+/// let mut client = Client::new("token", Handler).unwrap();
+///
+/// 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 48e09cd..09d3337 100644
--- a/src/builder/edit_profile.rs
+++ b/src/builder/edit_profile.rs
@@ -24,6 +24,7 @@ impl EditProfile {
     /// # use serenity::model::*;
     /// #
     /// # struct Handler;
+    ///
     /// # impl EventHandler for Handler {
     ///    # fn message(&self, context: Context, _: Message) {
     ///         use serenity::utils;
@@ -38,8 +39,10 @@ impl EditProfile {
     ///         });
     ///    # }
     /// }
-
-    /// # let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// #
+    /// # let mut client = Client::new("token", Handler).unwrap();
+    /// #
+    /// # client.start().unwrap();
     /// ```
     ///
     /// [`utils::read_image`]: ../fn.read_image.html
diff --git a/src/cache/mod.rs b/src/cache/mod.rs
index f9beaee..730d169 100644
--- a/src/cache/mod.rs
+++ b/src/cache/mod.rs
@@ -194,7 +194,9 @@ impl Cache {
     ///     }
     /// }
     ///
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     ///
     /// [`Member`]: ../model/struct.Member.html
@@ -386,7 +388,9 @@ impl Cache {
     ///     }
     /// }
     ///
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     ///
     /// [`ChannelId`]: ../model/struct.ChannelId.html
diff --git a/src/client/context.rs b/src/client/context.rs
index 261c8ff..a60aaa0 100644
--- a/src/client/context.rs
+++ b/src/client/context.rs
@@ -77,7 +77,9 @@ impl Context {
     ///         }
     ///     }
     /// }
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     #[cfg(feature = "builder")]
     pub fn edit_profile<F: FnOnce(EditProfile) -> EditProfile>(&self, f: F) -> Result<CurrentUser> {
@@ -128,7 +130,10 @@ impl Context {
     ///         }
     ///     }
     /// }
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    ///
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     ///
     /// [`Online`]: ../model/enum.OnlineStatus.html#variant.Online
@@ -157,7 +162,9 @@ impl Context {
     ///         }
     ///     }
     /// }
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     ///
     /// [`Idle`]: ../model/enum.OnlineStatus.html#variant.Idle
@@ -186,7 +193,9 @@ impl Context {
     ///         }
     ///     }
     /// }
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     ///
     /// [`DoNotDisturb`]: ../model/enum.OnlineStatus.html#variant.DoNotDisturb
@@ -215,7 +224,9 @@ impl Context {
     ///     }
     /// }
     ///
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     ///
     /// [`Event::Ready`]: ../model/event/enum.Event.html#variant.Ready
@@ -246,7 +257,9 @@ impl Context {
     ///     }
     /// }
     ///
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     ///
     /// [`Event::Resumed`]: ../model/event/enum.Event.html#variant.Resumed
@@ -271,6 +284,7 @@ impl Context {
     /// use serenity::model::Game;
     ///
     /// struct Handler;
+    ///
     /// impl EventHandler for Handler {
     ///     fn message(&self, ctx: Context, msg: Message) {
     ///         let args = msg.content.splitn(2, ' ').collect::<Vec<&str>>();
@@ -283,7 +297,9 @@ impl Context {
     ///     }
     /// }
     ///
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     ///
     /// [`Online`]: ../model/enum.OnlineStatus.html#variant.Online
@@ -317,7 +333,8 @@ impl Context {
     ///     }
     /// }
     ///
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// let mut client = Client::new("token", Handler).unwrap();
+    /// client.start().unwrap();
     /// ```
     ///
     /// [`Event::Ready`]: ../model/event/enum.Event.html#variant.Ready
@@ -357,7 +374,9 @@ impl Context {
     ///         ctx.set_presence(None, OnlineStatus::Idle);
     ///     }
     /// }
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     ///
     /// Setting the current user as playing `"Heroes of the Storm"`, while being
@@ -379,7 +398,10 @@ impl Context {
     ///         context.set_presence(Some(game), status);
     ///     }
     /// }
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    ///
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     ///
     /// [`DoNotDisturb`]: ../model/enum.OnlineStatus.html#variant.DoNotDisturb
diff --git a/src/client/mod.rs b/src/client/mod.rs
index 6f6b5ba..00a305a 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -222,7 +222,7 @@ pub struct Client<H: EventHandler + Send + Sync + 'static> {
     ///
     /// impl EventHandler for Handler { }
     ///
-    /// let mut client = Client::new(&env::var("DISCORD_TOKEN")?, Handler);
+    /// let mut client = Client::new(&env::var("DISCORD_TOKEN")?, Handler)?;
     ///
     /// let shard_runners = client.shard_runners.clone();
     ///
@@ -275,7 +275,7 @@ impl<H: EventHandler + Send + Sync + 'static> Client<H> {
     /// use std::env;
     ///
     /// let token = env::var("DISCORD_TOKEN")?;
-    /// let client = Client::new(&token, Handler);
+    /// let client = Client::new(&token, Handler)?;
     /// # Ok(())
     /// # }
     /// #
@@ -283,7 +283,7 @@ impl<H: EventHandler + Send + Sync + 'static> Client<H> {
     /// #    try_main().unwrap();
     /// # }
     /// ```
-    pub fn new(token: &str, handler: H) -> Self {
+    pub fn new(token: &str, handler: H) -> Result<Self> {
         let token = if token.starts_with("Bot ") {
             token.to_string()
         } else {
@@ -296,7 +296,7 @@ impl<H: EventHandler + Send + Sync + 'static> Client<H> {
         let name = "serenity client".to_owned();
         let threadpool = ThreadPool::with_name(name, 5);
 
-        feature_framework! {{
+        Ok(feature_framework! {{
             Client {
                 data: Arc::new(Mutex::new(ShareMap::custom())),
                 event_handler: Arc::new(handler),
@@ -313,7 +313,7 @@ impl<H: EventHandler + Send + Sync + 'static> Client<H> {
                 threadpool,
                 token: locked,
             }
-        }}
+        }})
     }
 
     /// Sets a framework to be used with the client. All message events will be
@@ -340,7 +340,7 @@ impl<H: EventHandler + Send + Sync + 'static> Client<H> {
     /// use serenity::Client;
     /// use std::env;
     ///
-    /// let mut client = Client::new(&env::var("DISCORD_TOKEN")?, Handler);
+    /// let mut client = Client::new(&env::var("DISCORD_TOKEN")?, Handler)?;
     /// client.with_framework(StandardFramework::new()
     ///     .configure(|c| c.prefix("~"))
     ///     .command("ping", |c| c.exec_str("Pong!")));
@@ -392,12 +392,11 @@ impl<H: EventHandler + Send + Sync + 'static> Client<H> {
     ///
     /// impl EventHandler for Handler {}
     ///
-    ///
     /// # fn try_main() -> Result<(), Box<Error>> {
     /// use serenity::Client;
     /// use std::env;
     ///
-    /// let mut client = Client::new(&env::var("DISCORD_TOKEN")?, Handler);
+    /// let mut client = Client::new(&token, Handler).unwrap();
     /// client.with_framework(MyFramework { commands: {
     ///     let mut map = HashMap::new();
     ///     map.insert("ping".to_string(), Box::new(|msg, _| msg.channel_id.say("pong!")));
@@ -447,7 +446,8 @@ impl<H: EventHandler + Send + Sync + 'static> Client<H> {
     /// use serenity::client::Client;
     /// use std::env;
     ///
-    /// let mut client = Client::new(&env::var("DISCORD_TOKEN")?, Handler);
+    /// let token = env::var("DISCORD_TOKEN")?;
+    /// let mut client = Client::new(&token, Handler).unwrap();
     ///
     /// if let Err(why) = client.start() {
     ///     println!("Err with client: {:?}", why);
@@ -492,7 +492,8 @@ impl<H: EventHandler + Send + Sync + 'static> Client<H> {
     /// use serenity::client::Client;
     /// use std::env;
     ///
-    /// let mut client = Client::new(&env::var("DISCORD_TOKEN")?, Handler);
+    /// let token = env::var("DISCORD_TOKEN")?;
+    /// let mut client = Client::new(&token, Handler).unwrap();
     ///
     /// if let Err(why) = client.start_autosharded() {
     ///     println!("Err with client: {:?}", why);
@@ -551,7 +552,8 @@ impl<H: EventHandler + Send + Sync + 'static> Client<H> {
     /// use serenity::client::Client;
     /// use std::env;
     ///
-    /// let mut client = Client::new(&env::var("DISCORD_TOKEN")?, Handler);
+    /// let token = env::var("DISCORD_TOKEN")?;
+    /// let mut client = Client::new(&token, Handler).unwrap();
     ///
     /// if let Err(why) = client.start_shard(3, 5) {
     ///     println!("Err with client: {:?}", why);
@@ -578,7 +580,7 @@ impl<H: EventHandler + Send + Sync + 'static> Client<H> {
     /// use serenity::client::Client;
     /// use std::env;
     ///
-    /// let mut client = Client::new(&env::var("DISCORD_TOKEN")?, Handler);
+    /// let mut client = Client::new(&env::var("DISCORD_TOKEN")?, Handler)?;
     ///
     /// if let Err(why) = client.start_shard(0, 1) {
     ///     println!("Err with client: {:?}", why);
@@ -631,7 +633,8 @@ impl<H: EventHandler + Send + Sync + 'static> Client<H> {
     /// use serenity::client::Client;
     /// use std::env;
     ///
-    /// let mut client = Client::new(&env::var("DISCORD_TOKEN")?, Handler);
+    /// let token = env::var("DISCORD_TOKEN")?;
+    /// let mut client = Client::new(&token, Handler).unwrap();
     ///
     /// if let Err(why) = client.start_shards(8) {
     ///     println!("Err with client: {:?}", why);
@@ -702,7 +705,8 @@ impl<H: EventHandler + Send + Sync + 'static> Client<H> {
     /// use serenity::client::Client;
     /// use std::env;
     ///
-    /// let mut client = Client::new(&env::var("DISCORD_TOKEN")?, Handler);
+    /// let token = env::var("DISCORD_TOKEN")?;
+    /// let mut client = Client::new(&token, Handler).unwrap();
     ///
     /// if let Err(why) = client.start_shard_range([4, 7], 10) {
     ///     println!("Err with client: {:?}", why);
diff --git a/src/framework/standard/configuration.rs b/src/framework/standard/configuration.rs
index 8cc25fa..6cb5767 100644
--- a/src/framework/standard/configuration.rs
+++ b/src/framework/standard/configuration.rs
@@ -20,11 +20,13 @@ use model::{GuildId, Message, UserId};
 /// struct Handler;
 ///
 /// impl EventHandler for Handler {}
+///
 /// use serenity::Client;
 /// use std::env;
 /// use serenity::framework::StandardFramework;
 ///
-/// let mut client = Client::new(&env::var("DISCORD_BOT_TOKEN").unwrap(), Handler);
+/// let token = env::var("DISCORD_BOT_TOKEN").unwrap();
+/// let mut client = Client::new(&token, Handler).unwrap();
 ///
 /// client.with_framework(StandardFramework::new()
 ///     .configure(|c| c.on_mention(true).prefix("~")));
@@ -98,7 +100,7 @@ impl Configuration {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// use serenity::model::GuildId;
     /// use serenity::framework::StandardFramework;
     ///
@@ -123,7 +125,7 @@ impl Configuration {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// use serenity::model::UserId;
     /// use serenity::framework::StandardFramework;
     ///
@@ -161,7 +163,7 @@ impl Configuration {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// use serenity::framework::StandardFramework;
     ///
     /// let disabled = vec!["ping"].into_iter().map(|x| x.to_string()).collect();
@@ -191,7 +193,7 @@ impl Configuration {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// use serenity::framework::StandardFramework;
     ///
     /// client.with_framework(StandardFramework::new()
@@ -276,7 +278,7 @@ impl Configuration {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// use serenity::model::UserId;
     /// use serenity::framework::StandardFramework;
     ///
@@ -291,7 +293,7 @@ impl Configuration {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// use serenity::model::UserId;
     /// use std::collections::HashSet;
     /// use serenity::framework::StandardFramework;
@@ -320,7 +322,7 @@ impl Configuration {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// #
     /// use serenity::framework::StandardFramework;
     ///
@@ -345,7 +347,7 @@ impl Configuration {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// #
     /// use serenity::framework::StandardFramework;
     ///
@@ -369,7 +371,7 @@ impl Configuration {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// #
     /// use serenity::framework::StandardFramework;
     ///
@@ -394,7 +396,7 @@ impl Configuration {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// #
     /// use serenity::framework::StandardFramework;
     ///
diff --git a/src/framework/standard/create_command.rs b/src/framework/standard/create_command.rs
index e4665e8..c1558ce 100644
--- a/src/framework/standard/create_command.rs
+++ b/src/framework/standard/create_command.rs
@@ -47,7 +47,8 @@ impl CreateCommand {
     /// use std::env;
     /// use std::sync::Arc;
     ///
-    /// let mut client = Client::new(&env::var("DISCORD_TOKEN").unwrap(), Handler);
+    /// let token = env::var("DISCORD_TOKEN").unwrap();
+    /// let mut client = Client::new(&token, Handler).unwrap();
     ///
     /// client.with_framework(StandardFramework::new()
     ///     .configure(|c| c.prefix("~"))
@@ -117,7 +118,7 @@ impl CreateCommand {
     /// command.
     ///
     /// You can return `Err(From::from(string))` if there's an error.
-    pub fn exec_help(mut self, f: 
+    pub fn exec_help(mut self, f:
                     fn(&mut Context, &Message, HashMap<String, Arc<CommandGroup>>, Args)
                     -> Result<(), CommandError>) -> Self {
         self.0.exec = CommandType::WithCommands(f);
diff --git a/src/framework/standard/help_commands.rs b/src/framework/standard/help_commands.rs
index ef7732b..56d096e 100644
--- a/src/framework/standard/help_commands.rs
+++ b/src/framework/standard/help_commands.rs
@@ -83,7 +83,7 @@ pub fn has_all_requirements(cmd: &Command, msg: &Message) -> bool {
 /// # struct Handler;
 /// #
 /// # impl EventHandler for Handler {}
-/// # let mut client = Client::new("token", Handler);
+/// # let mut client = Client::new("token", Handler).unwrap();
 /// #
 /// use serenity::framework::standard::{StandardFramework, help_commands};
 ///
@@ -255,7 +255,7 @@ pub fn with_embeds(_: &mut Context,
 /// # struct Handler;
 /// #
 /// # impl EventHandler for Handler {}
-/// # let mut client = Client::new("token", Handler);
+/// # let mut client = Client::new("token", Handler).unwrap();
 /// #
 /// use serenity::framework::standard::{StandardFramework, help_commands};
 ///
diff --git a/src/framework/standard/mod.rs b/src/framework/standard/mod.rs
index 36570af..1681bd7 100644
--- a/src/framework/standard/mod.rs
+++ b/src/framework/standard/mod.rs
@@ -143,7 +143,7 @@ use std::fmt;
 impl fmt::Debug for DispatchError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         use self::DispatchError::*;
-        
+
         match *self {
             CheckFailed(..) => write!(f, "DispatchError::CheckFailed"),
             CommandDisabled(ref s) => f.debug_tuple("DispatchError::CommandDisabled").field(&s).finish(),
@@ -218,7 +218,8 @@ impl StandardFramework {
     /// use serenity::framework::StandardFramework;
     /// use std::env;
     ///
-    /// let mut client = Client::new(&env::var("DISCORD_TOKEN").unwrap(), Handler);
+    /// let token = env::var("DISCORD_TOKEN").unwrap();
+    /// let mut client = Client::new(&token, Handler).unwrap();
     /// client.with_framework(StandardFramework::new()
     ///     .configure(|c| c
     ///         .depth(3)
@@ -251,7 +252,7 @@ impl StandardFramework {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// #
     /// use serenity::framework::StandardFramework;
     ///
@@ -287,7 +288,7 @@ impl StandardFramework {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// #
     /// use serenity::framework::StandardFramework;
     ///
@@ -396,7 +397,7 @@ impl StandardFramework {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// #
     /// use serenity::framework::StandardFramework;
     ///
@@ -592,7 +593,7 @@ impl StandardFramework {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// #
     /// use serenity::framework::StandardFramework;
     ///
@@ -684,7 +685,7 @@ impl StandardFramework {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// #
     /// use serenity::framework::StandardFramework;
     ///
@@ -717,7 +718,7 @@ impl StandardFramework {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// use serenity::framework::standard::DispatchError::{NotEnoughArguments,
     /// TooManyArguments};
     /// use serenity::framework::StandardFramework;
@@ -758,7 +759,7 @@ impl StandardFramework {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// #
     /// use serenity::framework::StandardFramework;
     ///
@@ -776,7 +777,7 @@ impl StandardFramework {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// #
     /// use serenity::framework::StandardFramework;
     ///
@@ -814,7 +815,7 @@ impl StandardFramework {
     /// # struct Handler;
     /// #
     /// # impl EventHandler for Handler {}
-    /// # let mut client = Client::new("token", Handler);
+    /// # let mut client = Client::new("token", Handler).unwrap();
     /// #
     /// use serenity::framework::StandardFramework;
     ///
diff --git a/src/gateway/shard.rs b/src/gateway/shard.rs
index 0b47acc..c644eac 100644
--- a/src/gateway/shard.rs
+++ b/src/gateway/shard.rs
@@ -623,7 +623,9 @@ impl Shard {
     ///         }
     ///     }
     /// }
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     ///
     /// [`Client`]: ../struct.Client.html
diff --git a/src/model/channel/attachment.rs b/src/model/channel/attachment.rs
index 4d72f58..f520cd4 100644
--- a/src/model/channel/attachment.rs
+++ b/src/model/channel/attachment.rs
@@ -91,7 +91,9 @@ impl Attachment {
     ///     }
     /// }
     /// let token = env::var("DISCORD_TOKEN").expect("token in environment");
-    /// let mut client = Client::new(&token, Handler); client.start().unwrap();
+    /// let mut client = Client::new(&token, Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     ///
     /// # Errors
diff --git a/src/model/channel/guild_channel.rs b/src/model/channel/guild_channel.rs
index 3f09bd7..8fc9abb 100644
--- a/src/model/channel/guild_channel.rs
+++ b/src/model/channel/guild_channel.rs
@@ -442,7 +442,9 @@ impl GuildChannel {
     ///         println!("The user's permissions: {:?}", permissions);
     ///     }
     /// }
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     ///
     /// Check if the current user has the [Attach Files] and [Send Messages]
@@ -488,7 +490,9 @@ impl GuildChannel {
     ///     }
     /// }
     ///
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     ///
     /// # Errors
diff --git a/src/model/channel/message.rs b/src/model/channel/message.rs
index b5864fc..984e274 100644
--- a/src/model/channel/message.rs
+++ b/src/model/channel/message.rs
@@ -88,7 +88,7 @@ impl Message {
     /// #   struct Handler;
     /// #
     /// #   impl EventHandler for Handler {}
-    /// #   let mut client = Client::new("token", Handler);
+    /// #   let mut client = Client::new("token", Handler).unwrap();
     /// #
     /// use serenity::model::Channel;
     /// use serenity::framework::StandardFramework;
diff --git a/src/model/error.rs b/src/model/error.rs
index a66095a..835678a 100644
--- a/src/model/error.rs
+++ b/src/model/error.rs
@@ -47,7 +47,9 @@ use super::Permissions;
 ///     }
 /// }
 /// let token = env::var("DISCORD_BOT_TOKEN")?;
-/// let mut client = Client::new(&token, Handler); client.start()?;
+/// let mut client = Client::new(&token, Handler).unwrap();
+///
+/// client.start()?;
 /// #     Ok(())
 /// # }
 /// #
diff --git a/src/model/guild/mod.rs b/src/model/guild/mod.rs
index 7582180..8483e75 100644
--- a/src/model/guild/mod.rs
+++ b/src/model/guild/mod.rs
@@ -1320,7 +1320,7 @@ impl Guild {
     ///     }
     /// }
     ///
-    /// let mut client = Client::new("token", Handler);
+    /// let mut client = Client::new("token", Handler).unwrap();
     ///
     /// client.start().unwrap();
     /// ```
diff --git a/src/model/guild/partial_guild.rs b/src/model/guild/partial_guild.rs
index bdfcbe0..c4181fd 100644
--- a/src/model/guild/partial_guild.rs
+++ b/src/model/guild/partial_guild.rs
@@ -464,7 +464,7 @@ impl PartialGuild {
     ///     }
     /// }
     ///
-    /// let mut client = Client::new("token", Handler);
+    /// let mut client = Client::new("token", Handler).unwrap();
     ///
     /// client.start().unwrap();
     /// ```
diff --git a/src/model/user.rs b/src/model/user.rs
index bf247f1..7eea83e 100644
--- a/src/model/user.rs
+++ b/src/model/user.rs
@@ -634,7 +634,8 @@ impl User {
     ///         // normal message handling here
     ///     }
     /// }
-    /// let mut client = Client::new("token", Handler);
+    ///
+    /// let mut client = Client::new("token", Handler).unwrap();
     /// #
     /// use serenity::model::UserId;
     /// use serenity::CACHE;
@@ -712,7 +713,9 @@ impl User {
     ///         }
     ///     }
     /// }
-    /// let mut client = Client::new("token", Handler); client.start().unwrap();
+    /// let mut client = Client::new("token", Handler).unwrap();
+    ///
+    /// client.start().unwrap();
     /// ```
     #[inline]
     pub fn tag(&self) -> String { tag(&self.name, self.discriminator) }