Update & unpin serenity (#218)

* Revert "Pin serenity commit"

This reverts commit b1d6bf6.

* `cargo update`

* fix serenity update

Cargo.toml

@@ -27,7 +27,7 @@ features = ["builder", "client", "gateway", "model", "utils", "collector", "fram
 # version = "0.11.6"
 
 git = "https://github.com/serenity-rs/serenity"
-rev = "a0c102f9acfd8d7184650815e06e0301954cb9e7"
+branch = "next"
 
 # path = "../_downloaded/serenity"
 

src/choice_parameter.rs

@@ -30,7 +30,7 @@ impl<T: ChoiceParameter> crate::SlashArgument for T {
         value: &serenity::ResolvedValue<'_>,
     ) -> Result<Self, crate::SlashArgError> {
         #[allow(unused_imports)]
-        use ::serenity::json::prelude::*; // Required for simd-json :|
+        use ::serenity::json::*; // Required for simd-json :|
         use std::convert::TryInto as _;
 
         let choice_key = match *value {

src/dispatch/slash.rs

@@ -236,7 +236,7 @@ async fn run_autocomplete<U, E>(
     };
 
     #[allow(unused_imports)]
-    use ::serenity::json::prelude::*; // as_str() access via trait for simd-json
+    use ::serenity::json::*; // as_str() access via trait for simd-json
 
     // Generate an autocomplete response
     let autocomplete_response = match autocomplete_callback(ctx, partial_input).await {

src/reply/builder.rs

@@ -216,7 +216,7 @@ impl CreateReply {
         }
         f = f.add_embeds(embeds);
         for attachment in attachments {
-            f = f.attachment(attachment);
+            f = f.new_attachment(attachment);
         }
 
         if let Some(allowed_mentions) = allowed_mentions {

src/slash_argument/slash_macro.rs

@@ -1,7 +1,7 @@
 //! Infrastructure to parse received slash command arguments into Rust types.
 
 #[allow(unused_imports)] // import is required if serenity simd_json feature is enabled
-use crate::serenity::json::prelude::*;
+use crate::serenity::json::*;
 #[allow(unused_imports)] // required for introdoc-links in doc comments
 use crate::serenity_prelude as serenity;
 

src/slash_argument/slash_trait.rs

@@ -5,7 +5,7 @@ use std::convert::TryInto as _;
 use std::marker::PhantomData;
 
 #[allow(unused_imports)] // import is required if serenity simd_json feature is enabled
-use crate::serenity::json::prelude::*;
+use crate::serenity::json::*;
 use crate::serenity_prelude as serenity;
 
 /// Implement this trait on types that you want to use as a slash command parameter.

src/structs/context.rs

@@ -393,7 +393,7 @@ context_methods! {
                 string += &ctx.command.name;
                 for arg in ctx.args {
                     #[allow(unused_imports)] // required for simd-json
-                    use ::serenity::json::prelude::*;
+                    use ::serenity::json::*;
                     use std::fmt::Write as _;
 
                     string += " ";