diff options
| author | Zeyla Hellyer <[email protected]> | 2018-03-25 19:48:53 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2018-03-25 19:48:53 -0700 |
| commit | e2f3ece27934af8b7b756a70d3b6090385d37c1e (patch) | |
| tree | e8085382bb92f88bfbaf95042360eb66f0a1921a /src/model | |
| parent | Remove `http::FutureResult`, use `error`'s (diff) | |
| parent | Remove useless clones (#292) (diff) | |
| download | serenity-e2f3ece27934af8b7b756a70d3b6090385d37c1e.tar.xz serenity-e2f3ece27934af8b7b756a70d3b6090385d37c1e.zip | |
Merge branch 'master' into futures
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/event.rs | 6 | ||||
| -rw-r--r-- | src/model/gateway.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/model/event.rs b/src/model/event.rs index fe710da..44135dc 100644 --- a/src/model/event.rs +++ b/src/model/event.rs @@ -176,7 +176,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 { @@ -213,7 +213,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") @@ -516,7 +516,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 b5fa84b..28968f7 100644 --- a/src/model/gateway.rs +++ b/src/model/gateway.rs @@ -228,7 +228,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) |