aboutsummaryrefslogtreecommitdiff
path: root/src/utils/mod.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/utils/mod.rs
parentUse a consistent indentation style (diff)
downloadserenity-550030264952f0e0043b63f4582bb817ef8bbf37.tar.xz
serenity-550030264952f0e0043b63f4582bb817ef8bbf37.zip
rustfmt
Diffstat (limited to 'src/utils/mod.rs')
-rw-r--r--src/utils/mod.rs24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index d3d728a..9cd68a1 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -6,10 +6,10 @@ mod colour;
mod message_builder;
pub use self::colour::Colour;
-pub use self::message_builder::{MessageBuilder, Content, ContentModifier};
+pub use self::message_builder::{Content, ContentModifier, MessageBuilder};
// Note: Here for BC purposes.
-#[cfg(feature="builder")]
+#[cfg(feature = "builder")]
pub use super::builder;
use base64;
@@ -17,8 +17,8 @@ use std::ffi::OsStr;
use std::fs::File;
use std::io::Read;
use std::path::Path;
-use ::internal::prelude::*;
-use ::model::{EmojiIdentifier, EmojiId};
+use internal::prelude::*;
+use model::{EmojiId, EmojiIdentifier};
/// Determines if a name is NSFW.
///
@@ -299,11 +299,13 @@ pub fn parse_emoji(mention: &str) -> Option<EmojiIdentifier> {
}
match id.parse::<u64>() {
- Ok(x) => Some(EmojiIdentifier {
- name: name,
- id: EmojiId(x)
- }),
- _ => None
+ Ok(x) => {
+ Some(EmojiIdentifier {
+ name: name,
+ id: EmojiId(x),
+ })
+ },
+ _ => None,
}
} else {
None
@@ -431,6 +433,4 @@ pub fn parse_quotes(s: &str) -> Vec<String> {
/// assert_eq!(utils::shard_id(81384788765712384, 17), 7);
/// ```
#[inline]
-pub fn shard_id(guild_id: u64, shard_count: u64) -> u64 {
- (guild_id >> 22) % shard_count
-}
+pub fn shard_id(guild_id: u64, shard_count: u64) -> u64 { (guild_id >> 22) % shard_count }