aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-07-26 20:37:06 -0700
committerZeyla Hellyer <[email protected]>2017-07-26 20:37:06 -0700
commit49aabe99ff573db5216e1b180aa1a015b8f11eae (patch)
tree98ec23f89d50572a7311c33d5337b3671c0bf188 /src
parentMake the `framework` module feature-gated and fix the names in the helper macro (diff)
downloadserenity-49aabe99ff573db5216e1b180aa1a015b8f11eae.tar.xz
serenity-49aabe99ff573db5216e1b180aa1a015b8f11eae.zip
Use a consistent indentation style
This project has - in the past - used an indentation style of 4 spaces, without trailing whitespace. This commit modifies lines with tab indentation to 4 spaces. Whether to use tabs or spaces is up to the current maintainer, but consistency avoids files eventually being completely mixed styles.
Diffstat (limited to 'src')
-rw-r--r--src/client/dispatch.rs36
-rw-r--r--src/internal/ws_impl.rs16
2 files changed, 26 insertions, 26 deletions
diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs
index 1e81a58..d54eb02 100644
--- a/src/client/dispatch.rs
+++ b/src/client/dispatch.rs
@@ -63,12 +63,12 @@ fn context(conn: &Arc<Mutex<Shard>>,
#[cfg(feature="builtin_framework")]
macro_rules! helper {
- ($enabled:block else $disabled:block) => { $enabled }
+ ($enabled:block else $disabled:block) => { $enabled }
}
#[cfg(not(feature="builtin_framework"))]
macro_rules! helper {
- ($enabled:block else $disabled:block) => { $disabled }
+ ($enabled:block else $disabled:block) => { $disabled }
}
#[cfg(feature="framework")]
@@ -81,19 +81,19 @@ pub fn dispatch<H: EventHandler + 'static>(event: Event,
match event {
Event::MessageCreate(event) => {
let context = context(conn, data);
- dispatch_message(context.clone(),
- event.message.clone(),
- event_handler,
- tokio_handle);
-
+ dispatch_message(context.clone(),
+ event.message.clone(),
+ event_handler,
+ tokio_handle);
+
if let Some(ref mut framework) = *framework.lock().unwrap() {
- helper! {{
- if framework.initialized() {
- framework.dispatch(context, event.message, tokio_handle);
- }
- } else {
- framework.dispatch(context, event.message, tokio_handle);
- }}
+ helper! {{
+ if framework.initialized() {
+ framework.dispatch(context, event.message, tokio_handle);
+ }
+ } else {
+ framework.dispatch(context, event.message, tokio_handle);
+ }}
}
},
other => handle_event(other, conn, data, event_handler, tokio_handle),
@@ -290,7 +290,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
let guild_amount = cache.guilds.iter()
.map(|(&id, _)| id)
.collect::<Vec<GuildId>>();
-
+
tokio_handle.spawn_fn(move || {
h.on_cached(context, guild_amount);
Ok(())
@@ -483,7 +483,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
.guilds
.get(&event.guild.id)
.cloned();
-
+
tokio_handle.spawn_fn(move || {
h.on_guild_update(context, before, event.guild);
Ok(())
@@ -554,7 +554,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
tokio_handle.spawn_fn(move || {
h.on_reaction_add(context, event.reaction);
Ok(())
- });
+ });
},
Event::ReactionRemove(event) => {
let h = event_handler.clone();
@@ -596,7 +596,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
tokio_handle.spawn_fn(move || {
h.on_ready(context, event.ready);
Ok(())
- });
+ });
}}
},
Event::Resumed(event) => {
diff --git a/src/internal/ws_impl.rs b/src/internal/ws_impl.rs
index 8366a23..573c4e6 100644
--- a/src/internal/ws_impl.rs
+++ b/src/internal/ws_impl.rs
@@ -17,12 +17,12 @@ 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> {
- let message = self.recv_message()?;
-
- if let OwnedMessage::Ping(ref x) = message {
- self.send_message(&OwnedMessage::Pong(x.clone())).map_err(Error::from)?;
- }
-
+ let message = self.recv_message()?;
+
+ if let OwnedMessage::Ping(ref x) = message {
+ self.send_message(&OwnedMessage::Pong(x.clone())).map_err(Error::from)?;
+ }
+
let res = match message {
OwnedMessage::Binary(bytes) => {
let value = serde_json::from_reader(ZlibDecoder::new(&bytes[..]))?;
@@ -49,8 +49,8 @@ impl ReceiverExt for WsClient<TlsStream<TcpStream>> {
},
OwnedMessage::Ping(..) | OwnedMessage::Pong(..) => None,
};
-
- res.unwrap()
+
+ res.unwrap()
}
}