diff options
| author | Zeyla Hellyer <[email protected]> | 2017-08-18 16:14:32 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-08-18 17:52:53 -0700 |
| commit | e4113570967a1fb13539efbfa2cf7285b19d95ba (patch) | |
| tree | 06bb020fcfaa5f8323454dfb525272314a900186 /src/model/gateway.rs | |
| parent | Move Clippy lints to a cfg_attr (diff) | |
| download | serenity-e4113570967a1fb13539efbfa2cf7285b19d95ba.tar.xz serenity-e4113570967a1fb13539efbfa2cf7285b19d95ba.zip | |
Apply rustfmt
Diffstat (limited to 'src/model/gateway.rs')
| -rw-r--r-- | src/model/gateway.rs | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/model/gateway.rs b/src/model/gateway.rs index 0c9f33e..6153abb 100644 --- a/src/model/gateway.rs +++ b/src/model/gateway.rs @@ -103,8 +103,9 @@ impl<'de> Deserialize<'de> for Game { let name = map.remove("name") .and_then(|v| String::deserialize(v).ok()) .unwrap_or_else(String::new); - let url = map.remove("url") - .and_then(|v| serde_json::from_value::<String>(v).ok()); + let url = map.remove("url").and_then(|v| { + serde_json::from_value::<String>(v).ok() + }); Ok(Game { kind: kind, @@ -170,8 +171,9 @@ impl<'de> Deserialize<'de> for Presence { .map_err(DeError::custom)?; let (user_id, user) = if user_map.len() > 1 { - let user = User::deserialize(Value::Object(user_map)) - .map_err(DeError::custom)?; + let user = User::deserialize(Value::Object(user_map)).map_err( + DeError::custom, + )?; (user.id, Some(Arc::new(RwLock::new(user)))) } else { @@ -185,8 +187,11 @@ impl<'de> Deserialize<'de> for Presence { }; let game = match map.remove("game") { - Some(v) => serde_json::from_value::<Option<Game>>(v) - .map_err(DeError::custom)?, + Some(v) => { + serde_json::from_value::<Option<Game>>(v).map_err( + DeError::custom, + )? + }, None => None, }; let last_modified = match map.remove("last_modified") { @@ -194,8 +199,11 @@ impl<'de> Deserialize<'de> for Presence { None => None, }; let nick = match map.remove("nick") { - Some(v) => serde_json::from_value::<Option<String>>(v) - .map_err(DeError::custom)?, + Some(v) => { + serde_json::from_value::<Option<String>>(v).map_err( + DeError::custom, + )? + }, None => None, }; let status = map.remove("status") |