Rewrite builders to take Cows (#2688)

Author: GnomedDev

examples/e14_slash_commands/Cargo.toml

@@ -2,7 +2,7 @@
 name = "e14_slash_commands"
 version = "0.1.0"
 authors = ["my name <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 serenity = { path = "../../", default-features = false, features = ["client", "gateway", "rustls_backend", "model", "collector"] }

examples/e14_slash_commands/src/commands/attachmentinput.rs

@@ -12,7 +12,7 @@ pub fn run(options: &[ResolvedOption]) -> String {
     }
 }
 
-pub fn register() -> CreateCommand {
+pub fn register() -> CreateCommand<'static> {
     CreateCommand::new("attachmentinput")
         .description("Test command for attachment input")
         .add_option(

examples/e14_slash_commands/src/commands/id.rs

@@ -12,7 +12,7 @@ pub fn run(options: &[ResolvedOption]) -> String {
     }
 }
 
-pub fn register() -> CreateCommand {
+pub fn register() -> CreateCommand<'static> {
     CreateCommand::new("id").description("Get a user id").add_option(
         CreateCommandOption::new(CommandOptionType::User, "id", "The user to lookup")
             .required(true),

examples/e14_slash_commands/src/commands/modal.rs

@@ -26,6 +26,6 @@ pub async fn run(ctx: &Context, interaction: &CommandInteraction) -> Result<(),
     Ok(())
 }
 
-pub fn register() -> CreateCommand {
+pub fn register() -> CreateCommand<'static> {
     CreateCommand::new("modal").description("Asks some details about you")
 }

examples/e14_slash_commands/src/commands/numberinput.rs

@@ -1,7 +1,7 @@
 use serenity::builder::{CreateCommand, CreateCommandOption};
 use serenity::model::application::CommandOptionType;
 
-pub fn register() -> CreateCommand {
+pub fn register() -> CreateCommand<'static> {
     CreateCommand::new("numberinput")
         .description("Test command for number input")
         .add_option(

examples/e14_slash_commands/src/commands/ping.rs

@@ -5,6 +5,6 @@ pub fn run(_options: &[ResolvedOption]) -> String {
     "Hey, I'm alive!".to_string()
 }
 
-pub fn register() -> CreateCommand {
+pub fn register() -> CreateCommand<'static> {
     CreateCommand::new("ping").description("A ping command")
 }

examples/e14_slash_commands/src/commands/welcome.rs

@@ -1,7 +1,16 @@
+use std::borrow::Cow;
+use std::collections::HashMap;
+
 use serenity::builder::{CreateCommand, CreateCommandOption};
 use serenity::model::application::CommandOptionType;
 
-pub fn register() -> CreateCommand {
+fn new_map<'a>(key: &'a str, value: &'a str) -> HashMap<Cow<'a, str>, Cow<'a, str>> {
+    let mut map = HashMap::with_capacity(1);
+    map.insert(Cow::Borrowed(key), Cow::Borrowed(value));
+    map
+}
+
+pub fn register() -> CreateCommand<'static> {
     CreateCommand::new("welcome")
         .description("Welcome a user")
         .name_localized("de", "begrüßen")
@@ -20,27 +29,28 @@ pub fn register() -> CreateCommand {
                 .add_string_choice_localized(
                     "Welcome to our cool server! Ask me if you need help",
                     "pizza",
-                    [(
+                    new_map(
                         "de",
                         "Willkommen auf unserem coolen Server! Frag mich, falls du Hilfe brauchst",
-                    )],
+                    ),
+                )
+                .add_string_choice_localized(
+                    "Hey, do you want a coffee?",
+                    "coffee",
+                    new_map("de", "Hey, willst du einen Kaffee?"),
                 )
-                .add_string_choice_localized("Hey, do you want a coffee?", "coffee", [(
-                    "de",
-                    "Hey, willst du einen Kaffee?",
-                )])
                 .add_string_choice_localized(
                     "Welcome to the club, you're now a good person. Well, I hope.",
                     "club",
-                    [(
+                    new_map(
                         "de",
                         "Willkommen im Club, du bist jetzt ein guter Mensch. Naja, hoffentlich.",
-                    )],
+                    ),
                 )
                 .add_string_choice_localized(
                     "I hope that you brought a controller to play together!",
                     "game",
-                    [("de", "Ich hoffe du hast einen Controller zum Spielen mitgebracht!")],
+                    new_map("de", "Ich hoffe du hast einen Controller zum Spielen mitgebracht!"),
                 ),
         )
 }

examples/e14_slash_commands/src/commands/wonderful_command.rs

@@ -1,5 +1,5 @@
 use serenity::builder::CreateCommand;
 
-pub fn register() -> CreateCommand {
+pub fn register() -> CreateCommand<'static> {
     CreateCommand::new("wonderful_command").description("An amazing command")
 }

examples/e14_slash_commands/src/main.rs

@@ -49,7 +49,7 @@ impl EventHandler for Handler {
         );
 
         let commands = guild_id
-            .set_commands(&ctx.http, vec![
+            .set_commands(&ctx.http, &[
                 commands::ping::register(),
                 commands::id::register(),
                 commands::welcome::register(),

examples/e17_message_components/src/main.rs

@@ -1,3 +1,4 @@
+use std::borrow::Cow;
 use std::env;
 use std::time::Duration;
 
@@ -40,13 +41,13 @@ impl EventHandler for Handler {
                 &ctx,
                 CreateMessage::new().content("Please select your favorite animal").select_menu(
                     CreateSelectMenu::new("animal_select", CreateSelectMenuKind::String {
-                        options: vec![
+                        options: Cow::Borrowed(&[
                             CreateSelectMenuOption::new("🐈 meow", "Cat"),
                             CreateSelectMenuOption::new("🐕 woof", "Dog"),
                             CreateSelectMenuOption::new("🐎 neigh", "Horse"),
                             CreateSelectMenuOption::new("🦙 hoooooooonk", "Alpaca"),
                             CreateSelectMenuOption::new("🦀 crab rave", "Ferris"),
-                        ],
+                        ]),
                     })
                     .custom_id("animal_select")
                     .placeholder("No animal selected"),