rustfmt

3 files changed, 41 insertions, 69 deletions

diff --git a/src/utils/colour.rs b/src/utils/colour.rs
index 6436a06..b52af9a 100644
--- a/src/utils/colour.rs
+++ b/src/utils/colour.rs
@@ -93,9 +93,7 @@ impl Colour {
     ///
     /// [`tuple`]: #method.tuple
     #[inline]
-    pub fn new(value: u32) -> Colour {
-        Colour(value)
-    }
+    pub fn new(value: u32) -> Colour { Colour(value) }
 
     /// Generates a new Colour from an RGB value, creating an inner u32
     /// representation.
@@ -140,9 +138,7 @@ impl Colour {
     ///
     /// assert_eq!(Colour::new(6573123).r(), 100);
     /// ```
-    pub fn r(&self) -> u8 {
-        ((self.0 >> 16) & 255) as u8
-    }
+    pub fn r(&self) -> u8 { ((self.0 >> 16) & 255) as u8 }
 
     /// Returns the green RGB component of this Colour.
     ///
@@ -153,9 +149,7 @@ impl Colour {
     ///
     /// assert_eq!(Colour::new(6573123).g(), 76);
     /// ```
-    pub fn g(&self) -> u8 {
-        ((self.0 >> 8) & 255) as u8
-    }
+    pub fn g(&self) -> u8 { ((self.0 >> 8) & 255) as u8 }
 
     /// Returns the blue RGB component of this Colour.
     ///
@@ -165,9 +159,7 @@ impl Colour {
     /// use serenity::utils::Colour;
     ///
     /// assert_eq!(Colour::new(6573123).b(), 67);
-    pub fn b(&self) -> u8 {
-        (self.0 & 255) as u8
-    }
+    pub fn b(&self) -> u8 { (self.0 & 255) as u8 }
 
     /// Returns a tuple of the red, green, and blue components of this Colour.
     ///
@@ -185,9 +177,7 @@ impl Colour {
     /// [`r`]: #method.r
     /// [`g`]: #method.g
     /// [`b`]: #method.b
-    pub fn tuple(&self) -> (u8, u8, u8) {
-        (self.r(), self.g(), self.b())
-    }
+    pub fn tuple(&self) -> (u8, u8, u8) { (self.r(), self.g(), self.b()) }
 }
 
 impl From<i32> for Colour {
@@ -204,9 +194,7 @@ impl From<i32> for Colour {
     ///
     /// assert_eq!(Colour::from(0xDEA584).tuple(), (222, 165, 132));
     /// ```
-    fn from(value: i32) -> Colour {
-        Colour(value as u32)
-    }
+    fn from(value: i32) -> Colour { Colour(value as u32) }
 }
 
 impl From<u32> for Colour {
@@ -221,9 +209,7 @@ impl From<u32> for Colour {
     ///
     /// assert_eq!(Colour::from(6573123u32).r(), 100);
     /// ```
-    fn from(value: u32) -> Colour {
-        Colour(value)
-    }
+    fn from(value: u32) -> Colour { Colour(value) }
 }
 
 impl From<u64> for Colour {
@@ -238,9 +224,7 @@ impl From<u64> for Colour {
     ///
     /// assert_eq!(Colour::from(6573123u64).r(), 100);
     /// ```
-    fn from(value: u64) -> Colour {
-        Colour(value as u32)
-    }
+    fn from(value: u64) -> Colour { Colour(value as u32) }
 }
 
 colour! {
@@ -304,7 +288,5 @@ colour! {
 
 impl Default for Colour {
     /// Creates a default value for a `Colour`, setting the inner value to `0`.
-    fn default() -> Colour {
-        Colour(0)
-    }
+    fn default() -> Colour { Colour(0) }
 }
diff --git a/src/utils/message_builder.rs b/src/utils/message_builder.rs
index 9132f9d..8fd26e9 100644
--- a/src/utils/message_builder.rs
+++ b/src/utils/message_builder.rs
@@ -1,7 +1,7 @@
 use std::default::Default;
-use std::fmt::{self, Write, Display};
+use std::fmt::{self, Display, Write};
 use std::ops::Add;
-use ::model::{ChannelId, Emoji, Mentionable, RoleId, UserId};
+use model::{ChannelId, Emoji, Mentionable, RoleId, UserId};
 
 /// The Message Builder is an ergonomic utility to easily build a message,
 /// by adding text and mentioning mentionable structs.
@@ -58,9 +58,7 @@ impl MessageBuilder {
     /// // alternatively:
     /// let message = MessageBuilder::default();
     /// ```
-    pub fn new() -> MessageBuilder {
-        MessageBuilder::default()
-    }
+    pub fn new() -> MessageBuilder { MessageBuilder::default() }
 
     /// Pulls the inner value out of the builder.
     ///
@@ -92,9 +90,7 @@ impl MessageBuilder {
     ///
     /// assert_eq!(content, "test");
     /// ```
-    pub fn build(self) -> String {
-        self.0
-    }
+    pub fn build(self) -> String { self.0 }
 
     /// Mentions the [`GuildChannel`] in the built message.
     ///
@@ -478,10 +474,8 @@ impl MessageBuilder {
     }
 
     /// Pushes a code-block to your message normalizing content.
-    pub fn push_codeblock_safe(mut self, content: &str, language: Option<&str>)
-        -> Self {
-        let content = &normalize(content)
-            .replace("```", "'''");
+    pub fn push_codeblock_safe(mut self, content: &str, language: Option<&str>) -> Self {
+        let content = &normalize(content).replace("```", "'''");
 
         self.0.push_str("```");
 
@@ -550,7 +544,8 @@ impl MessageBuilder {
     /// ```rust
     /// use serenity::utils::MessageBuilder;
     ///
-    /// let content = MessageBuilder::new().push_line_safe("Hello @everyone").push("How are you?").build();
+    /// let content = MessageBuilder::new().push_line_safe("Hello @everyone").push("How are
+    /// you?").build();
     ///
     /// assert_eq!(content, "Hello @\u{200B}everyone\nHow are you?");
     /// ```
@@ -649,7 +644,8 @@ impl MessageBuilder {
         self
     }
 
-    /// Pushes a strikethrough inline text with added newline to the content normalizing content.
+    /// Pushes a strikethrough inline text with added newline to the content normalizing
+    /// content.
     ///
     /// # Examples
     ///
@@ -721,9 +717,7 @@ impl Display for MessageBuilder {
     /// use serenity::utils::MessageBuilder;
     ///
     ///
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fmt::Display::fmt(&self.0, f)
-    }
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::Display::fmt(&self.0, f) }
 }
 
 
@@ -757,7 +751,7 @@ pub struct Content {
     pub strikethrough: bool,
     pub inner: String,
     pub code: bool,
-    pub underline: bool
+    pub underline: bool,
 }
 
 impl<T: ToString> Add<T> for Content {
@@ -806,10 +800,10 @@ impl Add<ContentModifier> for ContentModifier {
 
 impl ContentModifier {
     fn to_content(&self) -> Content {
-      let mut nc = Content::default();
-      nc.apply(self);
+        let mut nc = Content::default();
+        nc.apply(self);
 
-      nc
+        nc
     }
 }
 
@@ -835,12 +829,10 @@ impl Content {
     }
 
     pub fn to_string(&self) -> String {
-        let capacity = self.inner.len()
-            + if self.bold { 4 } else { 0 }
-            + if self.italic { 2 } else { 0 }
-            + if self.strikethrough { 4 } else { 0 }
-            + if self.underline { 4 } else { 0 }
-            + if self.code { 2 } else { 0 };
+        let capacity =
+            self.inner.len() + if self.bold { 4 } else { 0 } + if self.italic { 2 } else { 0 } +
+            if self.strikethrough { 4 } else { 0 } +
+            if self.underline { 4 } else { 0 } + if self.code { 2 } else { 0 };
         let mut new_str = String::with_capacity(capacity);
 
         if self.bold {
@@ -890,9 +882,7 @@ impl Content {
 }
 
 impl From<ContentModifier> for Content {
-    fn from(cm: ContentModifier) -> Content {
-        cm.to_content()
-    }
+    fn from(cm: ContentModifier) -> Content { cm.to_content() }
 }
 
 impl<T: ToString> From<T> for Content {
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 }