aboutsummaryrefslogtreecommitdiff
path: root/src/model
diff options
context:
space:
mode:
authorMaiddog <[email protected]>2018-03-17 13:07:42 -0500
committeralex <[email protected]>2018-03-17 19:07:42 +0100
commitb71d99fde84135fa66f73c4817d340ffbe8bddae (patch)
tree9061c50b8631c7aee1c5317f00a1b15c46e85da6 /src/model
parentFix no-cache standardframework compilation (#290) (diff)
downloadserenity-b71d99fde84135fa66f73c4817d340ffbe8bddae.tar.xz
serenity-b71d99fde84135fa66f73c4817d340ffbe8bddae.zip
Remove useless clones (#292)
Diffstat (limited to 'src/model')
-rw-r--r--src/model/event.rs6
-rw-r--r--src/model/gateway.rs2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/model/event.rs b/src/model/event.rs
index 6a58ce4..cf18995 100644
--- a/src/model/event.rs
+++ b/src/model/event.rs
@@ -479,7 +479,7 @@ impl<'de> Deserialize<'de> for GuildMemberAddEvent {
let guild_id = map.get("guild_id")
.ok_or_else(|| DeError::custom("missing member add guild id"))
- .and_then(|v| GuildId::deserialize(v.clone()))
+ .and_then(|v| GuildId::deserialize(v))
.map_err(DeError::custom)?;
Ok(GuildMemberAddEvent {
@@ -595,7 +595,7 @@ impl<'de> Deserialize<'de> for GuildMembersChunkEvent {
let guild_id = map.get("guild_id")
.ok_or_else(|| DeError::custom("missing member chunk guild id"))
- .and_then(|v| GuildId::deserialize(v.clone()))
+ .and_then(|v| GuildId::deserialize(v))
.map_err(DeError::custom)?;
let mut members = map.remove("members")
@@ -1136,7 +1136,7 @@ impl<'de> Deserialize<'de> for VoiceStateUpdateEvent {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> StdResult<Self, D::Error> {
let map = JsonMap::deserialize(deserializer)?;
let guild_id = match map.get("guild_id") {
- Some(v) => Some(GuildId::deserialize(v.clone()).map_err(DeError::custom)?),
+ Some(v) => Some(GuildId::deserialize(v).map_err(DeError::custom)?),
None => None,
};
diff --git a/src/model/gateway.rs b/src/model/gateway.rs
index 6ad2cda..924f27f 100644
--- a/src/model/gateway.rs
+++ b/src/model/gateway.rs
@@ -229,7 +229,7 @@ impl<'de> Deserialize<'de> for Presence {
let user_id = user_map
.remove("id")
.ok_or_else(|| DeError::custom("Missing presence user id"))
- .and_then(|x| UserId::deserialize(x.clone()))
+ .and_then(|x| UserId::deserialize(x))
.map_err(DeError::custom)?;
(user_id, None)