Fix breakage caused by AsRef removal and error cleanup

examples/advanced_cooldowns/main.rs

@@ -46,7 +46,7 @@ async fn main() {
         })
         .build();
 
-    let client = serenity::Client::builder(token, serenity::GatewayIntents::non_privileged())
+    let client = serenity::Client::builder(&token, serenity::GatewayIntents::non_privileged())
         .framework(framework)
         .await;
 

examples/basic_structure/main.rs

@@ -111,7 +111,7 @@ async fn main() {
     let intents =
         serenity::GatewayIntents::non_privileged() | serenity::GatewayIntents::MESSAGE_CONTENT;
 
-    let client = serenity::ClientBuilder::new(token, intents)
+    let client = serenity::ClientBuilder::new(&token, intents)
         .framework(framework)
         .await;
 

examples/event_handler/main.rs

@@ -38,7 +38,7 @@ async fn main() {
         })
         .build();
 
-    let client = serenity::ClientBuilder::new(token, intents)
+    let client = serenity::ClientBuilder::new(&token, intents)
         .framework(framework)
         .await;
 

examples/feature_showcase/main.rs

@@ -106,7 +106,7 @@ async fn main() {
     let intents =
         serenity::GatewayIntents::non_privileged() | serenity::GatewayIntents::MESSAGE_CONTENT;
 
-    let client = serenity::ClientBuilder::new(token, intents)
+    let client = serenity::ClientBuilder::new(&token, intents)
         .framework(framework)
         .await;
 

examples/fluent_localization/main.rs

@@ -75,7 +75,7 @@ async fn main() {
         .setup(move |_, _, _| Box::pin(async move { Ok(Data { translations }) }))
         .build();
 
-    let client = serenity::ClientBuilder::new(token, intents)
+    let client = serenity::ClientBuilder::new(&token, intents)
         .framework(framework)
         .await;
 

examples/help_generation/main.rs

@@ -350,7 +350,7 @@ async fn main() {
         })
         .build();
 
-    let client = serenity::ClientBuilder::new(token, intents)
+    let client = serenity::ClientBuilder::new(&token, intents)
         .framework(framework)
         .await;
 

examples/invocation_data/main.rs

@@ -121,7 +121,7 @@ async fn main() {
         })
         .build();
 
-    let client = serenity::ClientBuilder::new(token, intents)
+    let client = serenity::ClientBuilder::new(&token, intents)
         .framework(framework)
         .await;
 

examples/manual_dispatch/main.rs

@@ -51,7 +51,7 @@ async fn main() -> Result<(), Error> {
     poise::set_qualified_names(&mut handler.options.commands); // some setup
 
     let handler = std::sync::Arc::new(handler);
-    let mut client = serenity::Client::builder(token, intents)
+    let mut client = serenity::Client::builder(&token, intents)
         .event_handler::<Handler>(handler.clone())
         .await?;
 

examples/quickstart/main.rs

@@ -34,7 +34,7 @@ async fn main() {
         })
         .build();
 
-    let client = serenity::ClientBuilder::new(token, intents)
+    let client = serenity::ClientBuilder::new(&token, intents)
         .framework(framework)
         .await;
     client.unwrap().start().await.unwrap();

macros/src/modal.rs

@@ -86,7 +86,7 @@ pub fn modal(input: syn::DeriveInput) -> Result<TokenStream, darling::Error> {
         // Create modal parser code for this field
         let ok_or = if required {
             let error = format!("missing {}", field_ident);
-            Some(quote::quote! { .ok_or(#error)? })
+            Some(quote::quote! { .expect(#error) })
         } else {
             None
         };
@@ -107,8 +107,8 @@ pub fn modal(input: syn::DeriveInput) -> Result<TokenStream, darling::Error> {
                 )
             }
 
-            fn parse(mut data: serenity::ModalInteractionData) -> ::std::result::Result<Self, &'static str> {
-                Ok(Self { #( #parsers )* })
+            fn parse(mut data: serenity::ModalInteractionData) -> Self {
+                Self { #( #parsers )* }
             }
         }
     }; }

src/modal.rs

@@ -68,9 +68,7 @@ async fn execute_modal_generic<
         .create_response(ctx, serenity::CreateInteractionResponse::Acknowledge)
         .await?;
 
-    Ok(Some(
-        M::parse(response.data.clone()).map_err(serenity::Error::Other)?,
-    ))
+    Ok(Some(M::parse(response.data)))
 }
 
 /// Convenience function for showing the modal and waiting for a response.
@@ -184,7 +182,7 @@ pub trait Modal: Sized {
     ///
     /// Returns an error if a field was missing. This should never happen, because Discord will only
     /// let users submit when all required fields are filled properly
-    fn parse(data: serenity::ModalInteractionData) -> Result<Self, &'static str>;
+    fn parse(data: serenity::ModalInteractionData) -> Self;
 
     /// Calls `execute_modal(ctx, None, None)`. See [`execute_modal`]
     ///