Fix things up to new versions, get myself ready to get this all updat…

…ed to newer serenity libs.

Cargo.toml

@@ -9,15 +9,15 @@ repository = "https://github.com/tmcarr/testbot"
 
 [dependencies]
 # env_logger = "0.9.0"
-log = "0.4.20"
-rand = "0.8.5"
+log = "0.4.21"
+rand = "0.9.0-alpha.1"
 # migrant_lib = "0.33.0"
-reqwest = { version = "0.12.2", features = ["blocking", "json"] }
-serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.105"
-tokio = { version = "1.32.0", features = ["macros", "rt-multi-thread", "time"] }
-tracing = "0.1.37"
-tracing-subscriber = { version = "0.3.17", features = ["std", "env-filter"] }
+reqwest = { version = "0.12.3", features = ["blocking", "json"] }
+serde = { version = "1.0.198", features = ["derive"] }
+serde_json = "1.0.116"
+tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread", "time"] }
+tracing = "0.1.40"
+tracing-subscriber = { version = "0.3.18", features = ["std", "env-filter"] }
 dotenvy = "0.15.7"
 
 [dependencies.serenity]
@@ -36,7 +36,7 @@ features = [
     "rustls_backend",
     "unstable_discord_api"
 ]
-version = "0.11.6"
+version = "0.11.7"
 
 # [dependencies.diesel]
 # version = "2.0.2"

README.md

@@ -6,7 +6,7 @@ Toying around with Rust and the [serenity library](https://github.com/serenity-r
 
 ### Notes for M1 Macs:
 
-You need to use rustup to target x86 since some of diesel deps dont really like ARM yet.
+You need to use rustup to target x86 since some diesel deps don't really like ARM yet.
 
 ```
 rustup default nightly-x86_64-apple-darwin

src/commands/ball.rs

@@ -1,4 +1,4 @@
-use rand::seq::SliceRandom;
+use rand::prelude::IteratorRandom;
 use serenity::framework::standard::{macros::command, CommandResult};
 use serenity::model::prelude::*;
 use serenity::prelude::*;
@@ -31,8 +31,7 @@ async fn ball(ctx: &Context, msg: &Message) -> CommandResult {
         "You may rely on it.",
     ];
 
-    let choice = responses.choose(&mut rand::thread_rng()).unwrap();
-
+    let choice = responses.iter().choose(&mut rand::thread_rng()).unwrap();
     let _ = msg.channel_id.say(&ctx.http, choice).await;
 
     Ok(())

src/commands/botsnack.rs

@@ -1,4 +1,4 @@
-use rand::seq::SliceRandom;
+use rand::seq::IteratorRandom;
 use serenity::framework::standard::{macros::command, CommandResult};
 use serenity::model::prelude::*;
 use serenity::prelude::*;
@@ -8,7 +8,7 @@ use serenity::prelude::*;
 #[usage = ""]
 async fn botsnack(ctx: &Context, msg: &Message) -> CommandResult {
     let responses = ["Yum!", "*cronch*", "MOAR", "*Smiles*", "Nice."];
-    let response = responses.choose(&mut rand::thread_rng()).unwrap();
+    let response = responses.iter().choose(&mut rand::thread_rng()).unwrap();
 
     let _ = msg.channel_id.say(&ctx.http, response).await;
 

src/commands/desc.rs

@@ -1,7 +1,7 @@
 use crate::diesel::prelude::*;
 use crate::diesel::QueryDsl;
 use crate::diesel::RunQueryDsl;
-use crate::models::*;
+// use crate::models::*;
 use crate::schema::descriptions::dsl::*;
 use crate::PostgresClient;
 use diesel::r2d2::ManageConnection;

src/commands/drink.rs

@@ -1,4 +1,4 @@
-use rand::seq::SliceRandom;
+use rand::seq::IteratorRandom;
 use serenity::framework::standard::{macros::command, CommandResult};
 use serenity::model::prelude::*;
 use serenity::prelude::*;
@@ -25,7 +25,7 @@ async fn drink(ctx: &Context, msg: &Message) -> CommandResult {
         "Agua",
     ];
 
-    let drink = responses.choose(&mut rand::thread_rng()).unwrap();
+    let drink = responses.iter().choose(&mut rand::thread_rng()).unwrap();
 
     let _ = msg.channel_id.say(&ctx.http, drink).await;
 

src/commands/food.rs

@@ -1,4 +1,4 @@
-use rand::seq::SliceRandom;
+use rand::seq::IteratorRandom;
 use serenity::framework::standard::{macros::command, CommandResult};
 use serenity::model::prelude::*;
 use serenity::prelude::*;
@@ -13,7 +13,7 @@ async fn food(ctx: &Context, msg: &Message) -> CommandResult {
         "Indian", "Cajun",
     ];
 
-    let item = responses.choose(&mut rand::thread_rng()).unwrap();
+    let item = responses.iter().choose(&mut rand::thread_rng()).unwrap();
 
     let _ = msg.channel_id.say(&ctx.http, item).await;
 

src/commands/mod.rs

@@ -1,7 +1,7 @@
 pub mod advice;
 pub mod ball;
 pub mod botsnack;
-//pub mod desc;
+// pub mod desc;
 pub mod drink;
 pub mod food;
 pub mod github;