Merge v0.4.3

3 files changed, 14 insertions, 1 deletions

diff --git a/src/client/bridge/gateway/shard_runner.rs b/src/client/bridge/gateway/shard_runner.rs
index a5fde3d..0ba83ba 100644
--- a/src/client/bridge/gateway/shard_runner.rs
+++ b/src/client/bridge/gateway/shard_runner.rs
@@ -422,4 +422,11 @@ impl<H: EventHandler + Send + Sync + 'static> ShardRunner<H> {
 
         Ok(())
     }
+
+    fn request_shutdown(&self) -> Result<()> {
+        debug!("[ShardRunner {:?}] Requesting shutdown", self.shard_info);
+        let _ = self.manager_tx.send(ShardManagerMessage::ShutdownAll);
+
+        Ok(())
+    }
 }
diff --git a/src/client/context.rs b/src/client/context.rs
index 9b89cde..cc7ee63 100644
--- a/src/client/context.rs
+++ b/src/client/context.rs
@@ -281,6 +281,8 @@ impl Context {
     /// playing:
     ///
     /// ```rust,no_run
+    /// # #[cfg(feature = "model")]
+    /// # fn main() {
     /// # use serenity::prelude::*;
     /// # use serenity::model::*;
     /// #
@@ -303,6 +305,10 @@ impl Context {
     /// let mut client = Client::new("token", Handler).unwrap();
     ///
     /// client.start().unwrap();
+    /// # }
+    /// 
+    /// # #[cfg(not(feature = "model"))]
+    /// # fn main() {}
     /// ```
     ///
     /// [`Online`]: ../model/enum.OnlineStatus.html#variant.Online
diff --git a/src/client/mod.rs b/src/client/mod.rs
index 16e61fa..a227920 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -720,7 +720,7 @@ impl Client {
     /// use serenity::Client;
     /// use std::env;
     ///
-    /// let token = env::var("DISCORD_BOT_TOKEN").unwrap();
+    /// let token = env::var("DISCORD_TOKEN").unwrap();
     /// let mut client = Client::new(&token, Handler);
     ///
     /// let _ = client.start_shard_range([4, 7], 10);