Update dependencies and Rust toolchain version (#198)

* Update rust edition

* Update to Serenity 11.5

* Update a few deps

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "discord-compiler-bot"
 description = "Discord bot to compile your spaghetti code."
-version = "3.5.2"
+version = "3.5.3"
 authors = ["Michael Flaherty (Headline#9999)"]
-edition = "2018"
+edition = "2021"
 build = "src/build.rs"
 
 [dev-dependencies]
@@ -15,19 +15,20 @@ reqwest = { version = "0.11" }
 dotenv = "0.15.0"
 regex = "1"
 log = "0.4"
-pretty_env_logger = "0.3"
+pretty_env_logger = "0.4.0"
 strip-ansi-escapes = "0.1.0"
 serde = { version = "1.0.*", features = ["derive"] }
 serde_json = "1.0"
 lru-cache = "0.1"
 async-trait = "0.1"
 content_inspector = "0.2"
-shell-words = "0.1"
+shell-words = "1.1.0"
 const_format = "0.2"
 lazy_static = "1.4.0"
 similar = "2.1.0"
+
 #tests
-indoc = "1.0.3"
+indoc = "2.0.0"
 test-context = "0.1"
 #dbl
 dbl-rs = "0.3"
@@ -37,7 +38,7 @@ chrono = "0.4.19"
 
 
 [dependencies.serenity]
-version = "=0.11.1"
+version = "=0.11.5"
 default-features = false
 features = ["collector", "gateway", "builder", "standard_framework", "http", "model", "client", "framework", "utils", "rustls_backend"]
 

src/cache.rs

@@ -16,8 +16,8 @@ use crate::utls::blocklist::Blocklist;
 use crate::managers::command::CommandManager;
 use crate::managers::compilation::CompilationManager;
 use lru_cache::LruCache;
+use serenity::model::application::interaction::application_command::ApplicationCommandInteraction;
 use serenity::model::channel::Message;
-use serenity::model::interactions::application_command::ApplicationCommandInteraction;
 
 /** Caching **/
 

src/commands/asm.rs

@@ -20,10 +20,13 @@ use crate::utls::parser;
 #[bucket = "nospam"]
 pub async fn asm(ctx: &Context, msg: &Message, _args: Args) -> CommandResult {
     let emb = handle_request(ctx.clone(), msg.content.clone(), msg.author.clone(), msg).await?;
-    let mut emb_msg = embeds::embed_message(emb);
+    let emb_msg = embeds::embed_message(emb);
     let asm_embed = msg
         .channel_id
-        .send_message(&ctx.http, |_| &mut emb_msg)
+        .send_message(&ctx.http, |e| {
+            *e = emb_msg;
+            e
+        })
         .await?;
 
     // Success/fail react

src/commands/botinfo.rs

@@ -62,7 +62,7 @@ pub async fn botinfo(ctx: &Context, msg: &Message, _args: Args) -> CommandResult
                 );
 
                 e.fields(vec![
-                    ("Language", "Rust 2018", false),
+                    ("Language", "Rust 2021", false),
                     ("Software Version", env!("CARGO_PKG_VERSION"), false),
                     ("Author", env!("CARGO_PKG_AUTHORS"), false),
                     ("Build Information", str.as_str(), false),

src/commands/compile.rs

@@ -27,10 +27,13 @@ pub async fn compile(ctx: &Context, msg: &Message, _args: Args) -> CommandResult
     let embed = handle_request(ctx.clone(), msg.content.clone(), msg.author.clone(), msg).await?;
 
     // Send our final embed
-    let mut message = embeds::embed_message(embed);
+    let message = embeds::embed_message(embed);
     let compilation_embed = msg
         .channel_id
-        .send_message(&ctx.http, |_| &mut message)
+        .send_message(&ctx.http, |e| {
+            *e = message;
+            e
+        })
         .await?;
 
     // Success/fail react

src/commands/cpp.rs

@@ -20,12 +20,15 @@ use crate::{
 #[bucket = "nospam"]
 pub async fn cpp(ctx: &Context, msg: &Message, _args: Args) -> CommandResult {
     let emb = handle_request(ctx.clone(), msg.content.clone(), msg.author.clone(), msg).await?;
-    let mut emb_msg = embeds::embed_message(emb);
+    let emb_msg = embeds::embed_message(emb);
 
     // Dispatch our request
     let compilation_embed = msg
         .channel_id
-        .send_message(&ctx.http, |_| &mut emb_msg)
+        .send_message(&ctx.http, |e| {
+            *e = emb_msg;
+            e
+        })
         .await?;
 
     // add delete cache

src/commands/formats.rs

@@ -46,9 +46,12 @@ pub async fn formats(ctx: &Context, msg: &Message, _args: Args) -> CommandResult
         emb.field(&format.format_type, &output, false);
     }
 
-    let mut emb_msg = embeds::embed_message(emb);
+    let emb_msg = embeds::embed_message(emb);
     msg.channel_id
-        .send_message(&ctx.http, |_| &mut emb_msg)
+        .send_message(&ctx.http, |e| {
+            *e = emb_msg;
+            e
+        })
         .await?;
 
     return Ok(());

src/commands/help.rs

@@ -121,9 +121,12 @@ pub async fn help(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
 
         emb.description(description);
 
-        let mut emb_msg = embeds::embed_message(emb);
+        let emb_msg = embeds::embed_message(emb);
         msg.channel_id
-            .send_message(&ctx.http, |_| &mut emb_msg)
+            .send_message(&ctx.http, |e| {
+                *e = emb_msg;
+                e
+            })
             .await?;
 
         return Ok(());

src/commands/invite.rs

@@ -12,9 +12,12 @@ pub async fn invite(ctx: &Context, msg: &Message, _: Args) -> CommandResult {
 
     let emb = embeds::build_invite_embed(&invite);
 
-    let mut emb_msg = embeds::embed_message(emb);
+    let emb_msg = embeds::embed_message(emb);
     msg.channel_id
-        .send_message(&ctx.http, |_| &mut emb_msg)
+        .send_message(&ctx.http, |e| {
+            *e = emb_msg;
+            e
+        })
         .await?;
 
     Ok(())

src/events.rs

@@ -3,9 +3,9 @@ use serenity::{
     collector::CollectReaction,
     framework::{standard::macros::hook, standard::CommandResult, standard::DispatchError},
     model::{
-        channel::Message, channel::ReactionType, event::MessageUpdateEvent, gateway::Ready,
-        guild::Guild, id::ChannelId, id::GuildId, id::MessageId, interactions::Interaction,
-        prelude::UnavailableGuild,
+        application::interaction::Interaction, channel::Message, channel::ReactionType,
+        event::MessageUpdateEvent, gateway::Ready, guild::Guild, id::ChannelId, id::GuildId,
+        id::MessageId, prelude::UnavailableGuild,
     },
     prelude::*,
 };
@@ -110,9 +110,12 @@ impl EventHandler for Handler {
             info!("Joining {}", guild.name);
 
             if let Some(system_channel) = guild.system_channel_id {
-                let mut message = embeds::embed_message(embeds::build_welcome_embed());
+                let message = embeds::embed_message(embeds::build_welcome_embed());
                 let _ = system_channel
-                    .send_message(&ctx.http, |_| &mut message)
+                    .send_message(&ctx.http, |e| {
+                        *e = message;
+                        e
+                    })
                     .await;
             }
         }
@@ -210,10 +213,13 @@ impl EventHandler for Handler {
                                     &new_message.author,
                                     &format!("{}", e),
                                 );
-                                let mut emb_msg = embeds::embed_message(emb);
+                                let emb_msg = embeds::embed_message(emb);
                                 if let Ok(sent) = new_message
                                     .channel_id
-                                    .send_message(&ctx.http, |_| &mut emb_msg)
+                                    .send_message(&ctx.http, |e| {
+                                        *e = emb_msg;
+                                        e
+                                    })
                                     .await
                                 {
                                     let mut message_cache =
@@ -230,7 +236,10 @@ impl EventHandler for Handler {
                         emb_msg.reference_message(&new_message);
                         let _ = new_message
                             .channel_id
-                            .send_message(&ctx.http, |_| &mut emb_msg)
+                            .send_message(&ctx.http, |e| {
+                                *e = emb_msg;
+                                e
+                            })
                             .await;
                     }
                 }
@@ -357,13 +366,15 @@ pub async fn before(ctx: &Context, msg: &Message, _: &str) -> bool {
             If you feel that this has been done in error, request an unban in the support server.",
             );
 
-            let mut emb_msg = embeds::embed_message(emb);
-            if msg
+            let emb_msg = embeds::embed_message(emb);
+            let msg_response = msg
                 .channel_id
-                .send_message(&ctx.http, |_| &mut emb_msg)
-                .await
-                .is_ok()
-            {
+                .send_message(&ctx.http, |e| {
+                    *e = emb_msg;
+                    e
+                })
+                .await;
+            if msg_response.is_ok() {
                 if author_blocklisted {
                     warn!("Blocked user {} [{}]", msg.author.tag(), msg.author.id.0);
                 } else {
@@ -388,10 +399,13 @@ pub async fn after(
 
     if let Err(e) = command_result {
         let emb = embeds::build_fail_embed(&msg.author, &format!("{}", e));
-        let mut emb_msg = embeds::embed_message(emb);
+        let emb_msg = embeds::embed_message(emb);
         if let Ok(sent) = msg
             .channel_id
-            .send_message(&ctx.http, |_| &mut emb_msg)
+            .send_message(&ctx.http, |e| {
+                *e = emb_msg;
+                e
+            })
             .await
         {
             let mut message_cache = data.get::<MessageCache>().unwrap().lock().await;
@@ -410,12 +424,13 @@ pub async fn after(
 pub async fn dispatch_error(ctx: &Context, msg: &Message, error: DispatchError, _: &str) {
     if let DispatchError::Ratelimited(_) = error {
         let emb = embeds::build_fail_embed(&msg.author, "You are sending requests too fast!");
-        let mut emb_msg = embeds::embed_message(emb);
-        if msg
+        let emb_msg = embeds::embed_message(emb);
+        let _ = msg
             .channel_id
-            .send_message(&ctx.http, |_| &mut emb_msg)
-            .await
-            .is_err()
-        {}
+            .send_message(&ctx.http, |e| {
+                *e = emb_msg;
+                e
+            })
+            .await;
     }
 }