Fix compilation errors that arose from rebasing

Additionally, adapt some code to the `next` branch.

Cargo.toml

@@ -20,6 +20,7 @@ bitflags = "1.3"
 serde_json = "1.0.75"
 serde-value = "0.7"
 async-trait = "0.1.9"
+rustversion = "1.0.7"
 
 [dependencies.nougat]
 version = "0.2.0"
@@ -29,10 +30,6 @@ optional = true
 version = "2.2.0"
 optional = true
 
-[dependencies.rustversion]
-version = "1.0.7"
-optional = true
-
 [dependencies.simd-json]
 version = "0.4.14"
 optional = true
@@ -177,7 +174,7 @@ default_no_backend = [
 
 builder = ["utils"]
 cache = ["dashmap", "parking_lot"]
-collector = ["gateway", "model", "rustversion", "derivative", "nougat"]
+collector = ["gateway", "model", "derivative", "nougat"]
 client = ["http", "typemap_rev"]
 extras = []
 framework = ["client", "model", "utils"]
@@ -216,9 +213,6 @@ native_tls_backend = [
     "bytes",
 ]
 
-# TODO(next): Remove, these are deprecated aliases
-simdjson = ["simd_json"]
-voice-model = ["voice_model"]
 
 [package.metadata.docs.rs]
 features = ["default", "collector", "unstable_discord_api", "voice", "voice-model"]

build.rs

@@ -12,19 +12,4 @@ compile_error!(
     If you are unsure, go with `rustls_backend`."
 );
 
-#[cfg_attr(
-    feature = "simdjson",
-    deprecated = "The `simdjson` feature name is deprecated and will be removed in the next version of serenity, use `simd_json`."
-)]
-fn deprecated_simd_json_feature() {}
-
-#[cfg_attr(
-    feature = "voice-model",
-    deprecated = "The `voice-model` feature name is deprecated and will be removed in the next version of serenity, use `voice_model`."
-)]
-fn deprecated_voice_model_feature() {}
-
-fn main() {
-    deprecated_simd_json_feature();
-    deprecated_voice_model_feature()
-}
+fn main() {}

src/model/channel/guild_channel.rs

@@ -1,4 +1,3 @@
-use std::convert::TryFrom;
 use std::fmt;
 #[cfg(feature = "model")]
 use std::sync::Arc;

src/model/guild/guild_id.rs

@@ -91,7 +91,7 @@ impl GuildId {
     /// # async fn run() {
     /// # use serenity::http::Http;
     /// # let http = Http::new("token");
-    /// let _rule = GuildId(7)
+    /// let _rule = GuildId::new(7)
     ///     .create_automod_rule(&http, |r| {
     ///         r.name("foobar filter")
     ///             .trigger(Trigger::Keyword(vec!["foo*".to_string(), "*bar".to_string()]))