diff options
| author | acdenisSK <[email protected]> | 2017-07-27 06:42:48 +0200 |
|---|---|---|
| committer | acdenisSK <[email protected]> | 2017-07-27 07:30:23 +0200 |
| commit | 550030264952f0e0043b63f4582bb817ef8bbf37 (patch) | |
| tree | b921e2f78fd603a5ca671623083a32806fd16090 /src/internal | |
| parent | Use a consistent indentation style (diff) | |
| download | serenity-550030264952f0e0043b63f4582bb817ef8bbf37.tar.xz serenity-550030264952f0e0043b63f4582bb817ef8bbf37.zip | |
rustfmt
Diffstat (limited to 'src/internal')
| -rw-r--r-- | src/internal/macros.rs | 12 | ||||
| -rw-r--r-- | src/internal/mod.rs | 6 | ||||
| -rw-r--r-- | src/internal/prelude.rs | 6 | ||||
| -rw-r--r-- | src/internal/timer.rs | 4 | ||||
| -rw-r--r-- | src/internal/ws_impl.rs | 18 |
5 files changed, 23 insertions, 23 deletions
diff --git a/src/internal/macros.rs b/src/internal/macros.rs index c2475d1..7672316 100644 --- a/src/internal/macros.rs +++ b/src/internal/macros.rs @@ -66,7 +66,7 @@ macro_rules! status { } // Enable/disable check for cache -#[cfg(feature="cache")] +#[cfg(feature = "cache")] macro_rules! feature_cache { ($enabled:block else $disabled:block) => { { @@ -75,7 +75,7 @@ macro_rules! feature_cache { } } -#[cfg(not(feature="cache"))] +#[cfg(not(feature = "cache"))] macro_rules! feature_cache { ($enabled:block else $disabled:block) => { { @@ -85,7 +85,7 @@ macro_rules! feature_cache { } // Enable/disable check for framework -#[cfg(feature="framework")] +#[cfg(feature = "framework")] macro_rules! feature_framework { ($enabled:block else $disabled:block) => { { @@ -94,7 +94,7 @@ macro_rules! feature_framework { } } -#[cfg(not(feature="framework"))] +#[cfg(not(feature = "framework"))] macro_rules! feature_framework { ($enabled:block else $disabled:block) => { { @@ -104,7 +104,7 @@ macro_rules! feature_framework { } // Enable/disable check for voice -#[cfg(feature="voice")] +#[cfg(feature = "voice")] macro_rules! feature_voice { ($enabled:block else $disabled:block) => { { @@ -113,7 +113,7 @@ macro_rules! feature_voice { } } -#[cfg(not(feature="voice"))] +#[cfg(not(feature = "voice"))] macro_rules! feature_voice { ($enabled:block else $disabled:block) => { { diff --git a/src/internal/mod.rs b/src/internal/mod.rs index f0b65d8..2ff8067 100644 --- a/src/internal/mod.rs +++ b/src/internal/mod.rs @@ -3,11 +3,11 @@ pub mod macros; pub mod prelude; -#[cfg(feature="gateway")] +#[cfg(feature = "gateway")] pub mod ws_impl; -#[cfg(feature="voice")] +#[cfg(feature = "voice")] mod timer; -#[cfg(feature="voice")] +#[cfg(feature = "voice")] pub use self::timer::Timer; diff --git a/src/internal/prelude.rs b/src/internal/prelude.rs index e629322..21009d4 100644 --- a/src/internal/prelude.rs +++ b/src/internal/prelude.rs @@ -8,7 +8,7 @@ pub type JsonMap = Map<String, Value>; pub use serde_json::{Map, Number, Value}; pub use std::result::Result as StdResult; -pub use ::error::{Error, Result}; +pub use error::{Error, Result}; -#[cfg(feature="client")] -pub use ::client::ClientError; +#[cfg(feature = "client")] +pub use client::ClientError; diff --git a/src/internal/timer.rs b/src/internal/timer.rs index 1b51dda..0bd0d13 100644 --- a/src/internal/timer.rs +++ b/src/internal/timer.rs @@ -46,7 +46,5 @@ impl Timer { } } - pub fn reset(&mut self) { - self.due = Utc::now() + self.duration; - } + pub fn reset(&mut self) { self.due = Utc::now() + self.duration; } } 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)?; |