aboutsummaryrefslogtreecommitdiff
path: root/src/internal/ws_impl.rs
diff options
context:
space:
mode:
authoracdenisSK <[email protected]>2017-07-27 06:42:48 +0200
committeracdenisSK <[email protected]>2017-07-27 07:30:23 +0200
commit550030264952f0e0043b63f4582bb817ef8bbf37 (patch)
treeb921e2f78fd603a5ca671623083a32806fd16090 /src/internal/ws_impl.rs
parentUse a consistent indentation style (diff)
downloadserenity-550030264952f0e0043b63f4582bb817ef8bbf37.tar.xz
serenity-550030264952f0e0043b63f4582bb817ef8bbf37.zip
rustfmt
Diffstat (limited to 'src/internal/ws_impl.rs')
-rw-r--r--src/internal/ws_impl.rs18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/internal/ws_impl.rs b/src/internal/ws_impl.rs
index 573c4e6..6166f2b 100644
--- a/src/internal/ws_impl.rs
+++ b/src/internal/ws_impl.rs
@@ -3,12 +3,13 @@ use serde_json;
use websocket::message::OwnedMessage;
use websocket::sync::stream::{TcpStream, TlsStream};
use websocket::sync::Client as WsClient;
-use ::gateway::GatewayError;
-use ::internal::prelude::*;
+use gateway::GatewayError;
+use internal::prelude::*;
pub trait ReceiverExt {
fn recv_json<F, T>(&mut self, decode: F) -> Result<T>
- where F: FnOnce(Value) -> Result<T>;
+ where
+ F: FnOnce(Value) -> Result<T>;
}
pub trait SenderExt {
@@ -16,11 +17,14 @@ pub trait SenderExt {
}
impl ReceiverExt for WsClient<TlsStream<TcpStream>> {
- fn recv_json<F, T>(&mut self, decode: F) -> Result<T> where F: FnOnce(Value) -> Result<T> {
+ fn recv_json<F, T>(&mut self, decode: F) -> Result<T>
+ where
+ F: FnOnce(Value) -> Result<T>, {
let message = self.recv_message()?;
if let OwnedMessage::Ping(ref x) = message {
- self.send_message(&OwnedMessage::Pong(x.clone())).map_err(Error::from)?;
+ self.send_message(&OwnedMessage::Pong(x.clone()))
+ .map_err(Error::from)?;
}
let res = match message {
@@ -35,9 +39,7 @@ impl ReceiverExt for WsClient<TlsStream<TcpStream>> {
why
}))
},
- OwnedMessage::Close(data) => {
- Some(Err(Error::Gateway(GatewayError::Closed(data))))
- },
+ OwnedMessage::Close(data) => Some(Err(Error::Gateway(GatewayError::Closed(data)))),
OwnedMessage::Text(payload) => {
let value = serde_json::from_str(&payload)?;