Deprecate Client::login, add Client::new

serenity-rs · Jun 6, 2017 · 7990381 · 7990381
1 parent 630fc5e
commit 7990381
Show file tree

Hide file tree

Showing 24 changed files with 109 additions and 94 deletions.
diff --git a/examples/01_basic_ping_bot/src/main.rs b/examples/01_basic_ping_bot/src/main.rs
@@ -11,7 +11,7 @@ fn main() {
     // Create a new instance of the Client, logging in as a bot. This will
     // automatically prepend your bot token with "Bot ", which is a requirement
     // by Discord for bot users.
-    let mut client = Client::login(&token);
+    let mut client = Client::new(&token);
 
     // Set a handler for the `on_message` event - so that whenever a new message
     // is received - the closure (or function) passed will be called.

diff --git a/examples/02_transparent_guild_sharding/src/main.rs b/examples/02_transparent_guild_sharding/src/main.rs
@@ -25,7 +25,7 @@ fn main() {
     // Configure the client with your Discord bot token in the environment.
     let token = env::var("DISCORD_TOKEN")
         .expect("Expected a token in the environment");
-    let mut client = Client::login(&token);
+    let mut client = Client::new(&token);
 
     client.on_message(|ctx, msg| {
         if msg.content == "!ping" {

diff --git a/examples/03_struct_utilities/src/main.rs b/examples/03_struct_utilities/src/main.rs
@@ -7,7 +7,7 @@ fn main() {
     // Configure the client with your Discord bot token in the environment.
     let token = env::var("DISCORD_TOKEN")
         .expect("Expected a token in the environment");
-    let mut client = Client::login(&token);
+    let mut client = Client::new(&token);
 
     client.on_message(|_ctx, msg| {
         if msg.content == "!messageme" {

diff --git a/examples/04_message_builder/src/main.rs b/examples/04_message_builder/src/main.rs
@@ -8,7 +8,7 @@ fn main() {
     // Configure the client with your Discord bot token in the environment.
     let token = env::var("DISCORD_TOKEN")
         .expect("Expected a token in the environment");
-    let mut client = Client::login(&token);
+    let mut client = Client::new(&token);
 
     client.on_message(|_ctx, msg| {
         if msg.content == "!ping" {

diff --git a/examples/05_command_framework/src/main.rs b/examples/05_command_framework/src/main.rs
@@ -32,7 +32,7 @@ fn main() {
     // Configure the client with your Discord bot token in the environment.
     let token = env::var("DISCORD_TOKEN")
         .expect("Expected a token in the environment");
-    let mut client = Client::login(&token);
+    let mut client = Client::new(&token);
 
     {
         let mut data = client.data.lock().unwrap();

diff --git a/examples/06_voice/src/main.rs b/examples/06_voice/src/main.rs
@@ -20,7 +20,7 @@ fn main() {
     // Configure the client with your Discord bot token in the environment.
     let token = env::var("DISCORD_TOKEN")
         .expect("Expected a token in the environment");
-    let mut client = Client::login(&token);
+    let mut client = Client::new(&token);
 
     client.with_framework(|f| f
         .configure(|c| c

diff --git a/examples/07_sample_bot_structure/src/main.rs b/examples/07_sample_bot_structure/src/main.rs
@@ -18,7 +18,7 @@ use serenity::Client;
 use std::env;
 
 fn main() {
-    let mut client = Client::login(&env::var("DISCORD_TOKEN").unwrap());
+    let mut client = Client::new(&env::var("DISCORD_TOKEN").unwrap());
 
     client.with_framework(|f| f
         .configure(|c| c.prefix("~"))

diff --git a/src/builder/create_embed.rs b/src/builder/create_embed.rs
@@ -195,7 +195,7 @@ impl CreateEmbed {
     /// ```rust,no_run
     /// # use serenity::Client;
     /// #
-    /// # let mut client = Client::login("");
+    /// # let mut client = Client::new("");
     /// #
     /// client.on_message(|_, msg| {
     ///     if msg.content == "~embed" {
@@ -214,7 +214,7 @@ impl CreateEmbed {
     /// ```rust,no_run
     /// # use serenity::Client;
     /// #
-    /// # let mut client = Client::login("");
+    /// # let mut client = Client::new("");
     /// #
     /// use serenity::CACHE;
     ///

diff --git a/src/builder/create_invite.rs b/src/builder/create_invite.rs
@@ -14,7 +14,7 @@ use ::internal::prelude::*;
 /// ```rust,no_run
 /// # use serenity::Client;
 /// #
-/// # let mut client = Client::login("");
+/// # let mut client = Client::new("");
 /// #
 /// use serenity::client::CACHE;
 ///

diff --git a/src/builder/edit_profile.rs b/src/builder/edit_profile.rs
@@ -21,7 +21,7 @@ impl EditProfile {
     /// ```rust,no_run
     /// # use serenity::Client;
     /// #
-    /// # let mut client = Client::login("");
+    /// # let mut client = Client::new("");
     /// #
     /// # client.on_message(|context, _| {
     /// #

diff --git a/src/cache/mod.rs b/src/cache/mod.rs
@@ -203,7 +203,7 @@ impl Cache {
     /// ```rust,no_run
     /// # use serenity::Client;
     /// #
-    /// # let mut client = Client::login("");
+    /// # let mut client = Client::new("");
     /// #
     /// use serenity::client::CACHE;
     /// use std::thread;
@@ -285,7 +285,7 @@ impl Cache {
     /// ```rust,no_run
     /// # use serenity::Client;
     /// #
-    /// # let mut client = Client::login("");
+    /// # let mut client = Client::new("");
     /// #
     /// use serenity::client::CACHE;
     ///
@@ -392,7 +392,7 @@ impl Cache {
     /// ```rust,no_run
     /// # use serenity::Client;
     /// #
-    /// # let mut client = Client::login("");
+    /// # let mut client = Client::new("");
     /// #
     /// # client.on_message(|ctx, message| {
     /// #

diff --git a/src/client/context.rs b/src/client/context.rs
@@ -79,7 +79,7 @@ impl Context {
     /// ```rust,no_run
     /// # use serenity::Client;
     /// #
-    /// # let mut client = Client::login("");
+    /// # let mut client = Client::new("");
     /// #
     /// # client.on_message(|ctx, msg| {
     /// #     if msg.content == "!changename" {
@@ -124,7 +124,7 @@ impl Context {
     /// ```rust,no_run
     /// # use serenity::Client;
     /// #
-    /// # let mut client = Client::login("");
+    /// # let mut client = Client::new("");
     /// client.on_message(|ctx, msg| {
     ///     if msg.content == "!online" {
     ///         ctx.online();
@@ -147,7 +147,7 @@ impl Context {
     /// ```rust,no_run
     /// # use serenity::Client;
     /// #
-    /// # let mut client = Client::login("");
+    /// # let mut client = Client::new("");
     /// client.on_message(|ctx, msg| {
     ///     if msg.content == "!idle" {
     ///         ctx.idle();
@@ -170,7 +170,7 @@ impl Context {
     /// ```rust,no_run
     /// # use serenity::Client;
     /// #
-    /// # let mut client = Client::login("");
+    /// # let mut client = Client::new("");
     /// client.on_message(|ctx, msg| {
     ///     if msg.content == "!dnd" {
     ///         ctx.dnd();
@@ -194,7 +194,7 @@ impl Context {
     /// ```rust,no_run
     /// # use serenity::Client;
     /// #
-    /// # let mut client = Client::login("");
+    /// # let mut client = Client::new("");
     /// client.on_ready(|ctx, _| {
     ///     ctx.invisible();
     /// });
@@ -218,7 +218,7 @@ impl Context {
     /// ```rust,no_run
     /// # use serenity::Client;
     /// #
-    /// # let mut client = Client::login("");
+    /// # let mut client = Client::new("");
     /// client.on_resume(|ctx, _| {
     ///     ctx.reset_presence();
     /// });
@@ -243,7 +243,7 @@ impl Context {
     /// ```rust,no_run
     /// # use serenity::Client;
     /// #
-    /// # let mut client = Client::login("");
+    /// # let mut client = Client::new("");
     /// #
     /// use serenity::model::Game;
     ///
@@ -281,7 +281,7 @@ impl Context {
     /// ```rust,no_run
     /// # use serenity::Client;
     /// #
-    /// # let mut client = Client::login("");
+    /// # let mut client = Client::new("");
     /// #
     /// client.on_ready(|ctx, _| {
     ///     ctx.set_game_name("test");
@@ -316,7 +316,7 @@ impl Context {
     /// ```rust,no_run
     /// # use serenity::Client;
     /// #
-    /// # let mut client = Client::login("");
+    /// # let mut client = Client::new("");
     /// #
     /// # client.on_ready(|ctx, _| {
     /// #
@@ -332,7 +332,7 @@ impl Context {
     /// ```rust,ignore
     /// # use serenity::Client;
     /// #
-    /// # let mut client = Client::login("");
+    /// # let mut client = Client::new("");
     /// #
     /// # client.on_ready(|ctx, _| {
     /// #