Use type inference in serde functions (#1584)

serenity-rs · Mar 15, 2022 · d504bf2 · d504bf2
1 parent cb5d090
commit d504bf2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 25 deletions.
diff --git a/src/model/event.rs b/src/model/event.rs
@@ -1119,10 +1119,8 @@ impl CacheUpdate for PresencesReplaceEvent {
 
 impl<'de> Deserialize<'de> for PresencesReplaceEvent {
     fn deserialize<D: Deserializer<'de>>(deserializer: D) -> StdResult<Self, D::Error> {
-        let presences: Vec<Presence> = Deserialize::deserialize(deserializer)?;
-
         Ok(Self {
-            presences,
+            presences: Vec::deserialize(deserializer)?,
         })
     }
 }

diff --git a/src/model/utils.rs b/src/model/utils.rs
@@ -74,64 +74,50 @@ pub fn deserialize_members<'de, D: Deserializer<'de>>(
 pub fn deserialize_partial_members_map<'de, D: Deserializer<'de>>(
     deserializer: D,
 ) -> StdResult<HashMap<UserId, PartialMember>, D::Error> {
-    let map: HashMap<UserId, PartialMember> = Deserialize::deserialize(deserializer)?;
-
-    Ok(map)
+    HashMap::deserialize(deserializer)
 }
 
 #[cfg(all(feature = "unstable_discord_api", feature = "model"))]
 pub fn deserialize_users<'de, D: Deserializer<'de>>(
     deserializer: D,
 ) -> StdResult<HashMap<UserId, User>, D::Error> {
-    let map: HashMap<UserId, User> = Deserialize::deserialize(deserializer)?;
-
-    Ok(map)
+    HashMap::deserialize(deserializer)
 }
 
 #[cfg(all(feature = "unstable_discord_api", feature = "model"))]
 pub fn deserialize_roles_map<'de, D: Deserializer<'de>>(
     deserializer: D,
 ) -> StdResult<HashMap<RoleId, Role>, D::Error> {
-    let map: HashMap<RoleId, Role> = Deserialize::deserialize(deserializer)?;
-
-    Ok(map)
+    HashMap::deserialize(deserializer)
 }
 
 #[cfg(all(feature = "unstable_discord_api", feature = "model"))]
 pub fn deserialize_channels_map<'de, D: Deserializer<'de>>(
     deserializer: D,
 ) -> StdResult<HashMap<ChannelId, PartialChannel>, D::Error> {
-    let map: HashMap<ChannelId, PartialChannel> = Deserialize::deserialize(deserializer)?;
-
-    Ok(map)
+    HashMap::deserialize(deserializer)
 }
 
 #[cfg(all(feature = "unstable_discord_api", feature = "model"))]
 pub fn deserialize_messages_map<'de, D: Deserializer<'de>>(
     deserializer: D,
 ) -> StdResult<HashMap<MessageId, Message>, D::Error> {
-    let map: HashMap<MessageId, Message> = Deserialize::deserialize(deserializer)?;
-
-    Ok(map)
+    HashMap::deserialize(deserializer)
 }
 
 #[cfg(all(feature = "unstable_discord_api", feature = "model"))]
 pub fn deserialize_options<'de, D: Deserializer<'de>>(
     deserializer: D,
 ) -> StdResult<Vec<ApplicationCommandInteractionDataOption>, D::Error> {
-    let options: Vec<ApplicationCommandInteractionDataOption> =
-        Deserialize::deserialize(deserializer)?;
-
-    Ok(options)
+    Vec::deserialize(deserializer)
 }
 
 #[cfg(all(feature = "unstable_discord_api", feature = "model"))]
 pub fn deserialize_options_with_resolved<'de, D: Deserializer<'de>>(
     deserializer: D,
     resolved: &ApplicationCommandInteractionDataResolved,
 ) -> StdResult<Vec<ApplicationCommandInteractionDataOption>, D::Error> {
-    let mut options: Vec<ApplicationCommandInteractionDataOption> =
-        Deserialize::deserialize(deserializer)?;
+    let mut options = Vec::deserialize(deserializer)?;
 
     for option in options.iter_mut() {
         loop_resolved(option, resolved);
@@ -236,7 +222,7 @@ pub mod presences {
 pub fn deserialize_buttons<'de, D: Deserializer<'de>>(
     deserializer: D,
 ) -> StdResult<Vec<ActivityButton>, D::Error> {
-    let labels: Vec<String> = Deserialize::deserialize(deserializer)?;
+    let labels = Vec::deserialize(deserializer)?;
     let mut buttons = vec![];
 
     for label in labels {