aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-12-19 20:30:05 -0800
committerZeyla Hellyer <[email protected]>2017-12-19 20:30:54 -0800
commitcc20a9c3c21370fbe62f74ea45a3ed18b9490efb (patch)
tree2339d7e42e35bcbcb6f1e7c3a2f55858c10225bd /src
parentActually fix `Args`'s `parse` and add a few tests (#236) (diff)
downloadserenity-cc20a9c3c21370fbe62f74ea45a3ed18b9490efb.tar.xz
serenity-cc20a9c3c21370fbe62f74ea45a3ed18b9490efb.zip
GatewayEvent: don't unwrap deserializations
This commit makes GatewayEvent no longer unwrap Dispatch deserializations, and instead Try? it away.
Diffstat (limited to 'src')
-rw-r--r--src/model/event.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/model/event.rs b/src/model/event.rs
index 58a9c23..e68fa7a 100644
--- a/src/model/event.rs
+++ b/src/model/event.rs
@@ -1084,7 +1084,8 @@ impl<'de> Deserialize<'de> for GatewayEvent {
Error::Decode("expected gateway event d", Value::Object(map))
}).map_err(DeError::custom)?;
- let x = deserialize_event_with_type(kind, payload).unwrap();
+ let x = deserialize_event_with_type(kind, payload)
+ .map_err(DeError::custom)?;
GatewayEvent::Dispatch(s, x)
},