diff options
| author | acdenisSK <[email protected]> | 2016-12-07 19:10:21 +0100 |
|---|---|---|
| committer | zeyla <[email protected]> | 2016-12-07 10:10:21 -0800 |
| commit | f69512beaa157775accd4392295dba112adcf1df (patch) | |
| tree | 0944aeabdec8609393f78b9ec257dc5d09d4f6c0 /src/internal | |
| parent | Allow mentionable structs to be used as command arguments (diff) | |
| download | serenity-f69512beaa157775accd4392295dba112adcf1df.tar.xz serenity-f69512beaa157775accd4392295dba112adcf1df.zip | |
Change all try's into ?s
This breaks compatibility with < 1.13, but we didn't support that anyway.
Diffstat (limited to 'src/internal')
| -rw-r--r-- | src/internal/ws_impl.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/internal/ws_impl.rs b/src/internal/ws_impl.rs index 72af52c..9fd2e2d 100644 --- a/src/internal/ws_impl.rs +++ b/src/internal/ws_impl.rs @@ -19,7 +19,7 @@ pub trait SenderExt { impl ReceiverExt for Receiver<WebSocketStream> { fn recv_json<F, T>(&mut self, decode: F) -> Result<T> where F: FnOnce(Value) -> Result<T> { - let message: WsMessage = try!(self.recv_message()); + let message: WsMessage = self.recv_message()?; if message.opcode == WsType::Close { let r = String::from_utf8_lossy(&message.payload).into_owned(); @@ -27,9 +27,9 @@ impl ReceiverExt for Receiver<WebSocketStream> { Err(Error::Gateway(GatewayError::Closed(message.cd_status_code, r))) } else if message.opcode == WsType::Binary || message.opcode == WsType::Text { let json: Value = if message.opcode == WsType::Binary { - try!(serde_json::from_reader(ZlibDecoder::new(&message.payload[..]))) + serde_json::from_reader(ZlibDecoder::new(&message.payload[..]))? } else { - try!(serde_json::from_reader(&message.payload[..])) + serde_json::from_reader(&message.payload[..])? }; match decode(json) { |