rustfmt

11 files changed, 148 insertions, 109 deletions

diff --git a/src/builder/create_embed.rs b/src/builder/create_embed.rs
index da196ec..c0dead6 100644
--- a/src/builder/create_embed.rs
+++ b/src/builder/create_embed.rs
@@ -19,11 +19,11 @@ use chrono::{DateTime, TimeZone};
 use serde_json::Value;
 use std::default::Default;
 use std::fmt::Display;
-use ::internal::prelude::*;
-use ::model::Embed;
+use internal::prelude::*;
+use model::Embed;
 
-#[cfg(feature="utils")]
-use ::utils::Colour;
+#[cfg(feature = "utils")]
+use utils::Colour;
 
 /// A builder to create a fake [`Embed`] object, for use with the
 /// [`ChannelId::send_message`] and [`ExecuteWebhook::embeds`] methods.
@@ -47,7 +47,8 @@ impl CreateEmbed {
     ///
     /// [`CreateEmbedAuthor`]: struct.CreateEmbedAuthor.html
     pub fn author<F>(mut self, f: F) -> Self
-        where F: FnOnce(CreateEmbedAuthor) -> CreateEmbedAuthor {
+    where
+        F: FnOnce(CreateEmbedAuthor) -> CreateEmbedAuthor, {
         let author = f(CreateEmbedAuthor::default()).0;
 
         self.0.insert("author".to_owned(), Value::Object(author));
@@ -60,16 +61,15 @@ impl CreateEmbed {
     /// This is an alias of [`colour`].
     ///
     /// [`colour`]: #method.colour
-    #[cfg(feature="utils")]
+    #[cfg(feature = "utils")]
     #[inline]
-    pub fn color<C: Into<Colour>>(self, colour: C) -> Self {
-        self.colour(colour.into())
-    }
+    pub fn color<C: Into<Colour>>(self, colour: C) -> Self { self.colour(colour.into()) }
 
     /// Set the colour of the left-hand side of the embed.
-    #[cfg(feature="utils")]
+    #[cfg(feature = "utils")]
     pub fn colour<C: Into<Colour>>(mut self, colour: C) -> Self {
-        self.0.insert("color".to_owned(), Value::Number(Number::from(colour.into().0 as u64)));
+        self.0.insert("color".to_owned(),
+                      Value::Number(Number::from(colour.into().0 as u64)));
 
         CreateEmbed(self.0)
     }
@@ -79,16 +79,15 @@ impl CreateEmbed {
     /// This is an alias of [`colour`].
     ///
     /// [`colour`]: #method.colour
-    #[cfg(not(feature="utils"))]
+    #[cfg(not(feature = "utils"))]
     #[inline]
-    pub fn color(self, colour: u32) -> Self {
-        self.colour(colour)
-    }
+    pub fn color(self, colour: u32) -> Self { self.colour(colour) }
 
     /// Set the colour of the left-hand side of the embed.
-    #[cfg(not(feature="utils"))]
+    #[cfg(not(feature = "utils"))]
     pub fn colour(mut self, colour: u32) -> Self {
-        self.0.insert("color".to_owned(), Value::Number(Number::from(colour)));
+        self.0
+            .insert("color".to_owned(), Value::Number(Number::from(colour)));
 
         CreateEmbed(self.0)
     }
@@ -97,7 +96,8 @@ impl CreateEmbed {
     ///
     /// **Note**: This can't be longer than 2048 characters.
     pub fn description(mut self, description: &str) -> Self {
-        self.0.insert("description".to_owned(), Value::String(description.to_owned()));
+        self.0.insert("description".to_owned(),
+                      Value::String(description.to_owned()));
 
         CreateEmbed(self.0)
     }
@@ -113,7 +113,8 @@ impl CreateEmbed {
     ///
     /// [`CreateEmbedField`]: struct.CreateEmbedField.html
     pub fn field<F>(mut self, f: F) -> Self
-        where F: FnOnce(CreateEmbedField) -> CreateEmbedField {
+    where
+        F: FnOnce(CreateEmbedField) -> CreateEmbedField, {
         let field = f(CreateEmbedField::default()).0;
 
         {
@@ -141,9 +142,12 @@ impl CreateEmbed {
 
     /// Adds multiple fields at once.
     pub fn fields(mut self, fields: Vec<CreateEmbedField>) -> Self {
-        let fields = fields.into_iter().map(|m| Value::Object(m.0)).collect::<Vec<Value>>();
-        
-         {
+        let fields = fields
+            .into_iter()
+            .map(|m| Value::Object(m.0))
+            .collect::<Vec<Value>>();
+
+        {
             let key = "fields".to_owned();
 
             let entry = self.0.remove(&key).unwrap_or_else(|| Value::Array(vec![]));
@@ -166,7 +170,8 @@ impl CreateEmbed {
     ///
     /// [`CreateEmbedFooter`]: struct.CreateEmbedFooter.html
     pub fn footer<F>(mut self, f: F) -> Self
-        where F: FnOnce(CreateEmbedFooter) -> CreateEmbedFooter {
+    where
+        F: FnOnce(CreateEmbedFooter) -> CreateEmbedFooter, {
         let footer = f(CreateEmbedFooter::default()).0;
 
         self.0.insert("footer".to_owned(), Value::Object(footer));
@@ -215,7 +220,7 @@ impl CreateEmbed {
     /// ```rust,no_run
     /// # use serenity::prelude::*;
     /// # use serenity::model::*;
-    /// # 
+    /// #
     /// struct Handler;
     /// impl EventHandler for Handler {
     ///     fn on_message(&self, _: Context, msg: Message) {
@@ -276,27 +281,30 @@ impl CreateEmbed {
     /// let mut client = Client::new("token", Handler); client.start().unwrap();
     /// ```
     pub fn timestamp<T: Into<Timestamp>>(mut self, timestamp: T) -> Self {
-        self.0.insert("timestamp".to_owned(), Value::String(timestamp.into().ts));
+        self.0
+            .insert("timestamp".to_owned(), Value::String(timestamp.into().ts));
 
         CreateEmbed(self.0)
     }
 
     /// Set the title of the embed.
     pub fn title(mut self, title: &str) -> Self {
-        self.0.insert("title".to_owned(), Value::String(title.to_owned()));
+        self.0
+            .insert("title".to_owned(), Value::String(title.to_owned()));
 
         CreateEmbed(self.0)
     }
 
     /// Set the URL to direct to when clicking on the title.
     pub fn url(mut self, url: &str) -> Self {
-        self.0.insert("url".to_owned(), Value::String(url.to_owned()));
+        self.0
+            .insert("url".to_owned(), Value::String(url.to_owned()));
 
         CreateEmbed(self.0)
     }
 
     /// Same as calling [`image`] with "attachment://filename.(jpg, png)".
-    /// 
+    ///
     /// Note however, you have to be sure you set an attachment (with [`ChannelId::send_files`])
     /// with the provided filename. Or else this won't work.
     ///
@@ -321,8 +329,7 @@ impl From<Embed> for CreateEmbed {
     ///
     /// Some values - such as Proxy URLs - are not preserved.
     fn from(embed: Embed) -> CreateEmbed {
-        let mut b = CreateEmbed::default()
-            .colour(embed.colour);
+        let mut b = CreateEmbed::default().colour(embed.colour);
 
         if let Some(author) = embed.author {
             b = b.author(move |mut a| {
@@ -345,10 +352,7 @@ impl From<Embed> for CreateEmbed {
         }
 
         for field in embed.fields {
-            b = b.field(move |f| f
-                .inline(field.inline)
-                .name(&field.name)
-                .value(&field.value));
+            b = b.field(move |f| f.inline(field.inline).name(&field.name).value(&field.value));
         }
 
         if let Some(image) = embed.image {
@@ -389,21 +393,24 @@ pub struct CreateEmbedAuthor(pub Map<String, Value>);
 impl CreateEmbedAuthor {
     /// Set the URL of the author's icon.
     pub fn icon_url(mut self, icon_url: &str) -> Self {
-        self.0.insert("icon_url".to_owned(), Value::String(icon_url.to_owned()));
+        self.0
+            .insert("icon_url".to_owned(), Value::String(icon_url.to_owned()));
 
         self
     }
 
     /// Set the author's name.
     pub fn name(mut self, name: &str) -> Self {
-        self.0.insert("name".to_owned(), Value::String(name.to_owned()));
+        self.0
+            .insert("name".to_owned(), Value::String(name.to_owned()));
 
         self
     }
 
     /// Set the author's URL.
     pub fn url(mut self, url: &str) -> Self {
-        self.0.insert("url".to_owned(), Value::String(url.to_owned()));
+        self.0
+            .insert("url".to_owned(), Value::String(url.to_owned()));
 
         self
     }
@@ -430,14 +437,16 @@ impl CreateEmbedField {
 
     /// Set the field's name. It can't be longer than 256 characters.
     pub fn name(mut self, name: &str) -> Self {
-        self.0.insert("name".to_owned(), Value::String(name.to_owned()));
+        self.0
+            .insert("name".to_owned(), Value::String(name.to_owned()));
 
         self
     }
 
     /// Set the field's value. It can't be longer than 1024 characters.
     pub fn value(mut self, value: &str) -> Self {
-        self.0.insert("value".to_owned(), Value::String(value.to_owned()));
+        self.0
+            .insert("value".to_owned(), Value::String(value.to_owned()));
 
         self
     }
@@ -467,14 +476,16 @@ pub struct CreateEmbedFooter(pub Map<String, Value>);
 impl CreateEmbedFooter {
     /// Set the icon URL's value. This only supports HTTP(S).
     pub fn icon_url(mut self, icon_url: &str) -> Self {
-        self.0.insert("icon_url".to_owned(), Value::String(icon_url.to_owned()));
+        self.0
+            .insert("icon_url".to_owned(), Value::String(icon_url.to_owned()));
 
         self
     }
 
     /// Set the footer's text.
     pub fn text(mut self, text: &str) -> Self {
-        self.0.insert("text".to_owned(), Value::String(text.to_owned()));
+        self.0
+            .insert("text".to_owned(), Value::String(text.to_owned()));
 
         self
     }
@@ -501,7 +512,9 @@ impl<'a> From<&'a str> for Timestamp {
     }
 }
 
-impl<'a, Tz: TimeZone> From<&'a DateTime<Tz>> for Timestamp where Tz::Offset: Display {
+impl<'a, Tz: TimeZone> From<&'a DateTime<Tz>> for Timestamp
+where
+    Tz::Offset: Display, {
     fn from(dt: &'a DateTime<Tz>) -> Self {
         Timestamp {
             ts: dt.to_rfc3339(),
diff --git a/src/builder/create_invite.rs b/src/builder/create_invite.rs
index 8253205..58893fc 100644
--- a/src/builder/create_invite.rs
+++ b/src/builder/create_invite.rs
@@ -1,6 +1,6 @@
 use serde_json::Value;
 use std::default::Default;
-use ::internal::prelude::*;
+use internal::prelude::*;
 
 /// A builder to create a [`RichInvite`] for use via [`GuildChannel::create_invite`].
 ///
@@ -14,9 +14,9 @@ use ::internal::prelude::*;
 /// ```rust,no_run
 /// # use serenity::prelude::*;
 /// # use serenity::model::*;
-/// 
+///
 /// struct Handler;
-/// 
+///
 /// impl EventHandler for Handler {
 ///     fn on_message(&self, _: Context, msg: Message) {
 ///         use serenity::client::CACHE;
@@ -49,8 +49,8 @@ use ::internal::prelude::*;
 ///
 ///             let content = format!("Here's your invite: {}", invite.url());
 ///             let _ = msg.channel_id.say(&content);
-///         } 
-///     }   
+///         }
+///     }
 /// }
 /// let mut client = Client::new("token", Handler); client.start().unwrap();
 /// ```
@@ -89,7 +89,8 @@ impl CreateInvite {
     /// # }
     /// ```
     pub fn max_age(mut self, max_age: u64) -> Self {
-        self.0.insert("max_age".to_owned(), Value::Number(Number::from(max_age)));
+        self.0
+            .insert("max_age".to_owned(), Value::Number(Number::from(max_age)));
 
         self
     }
@@ -122,7 +123,8 @@ impl CreateInvite {
     /// # }
     /// ```
     pub fn max_uses(mut self, max_uses: u64) -> Self {
-        self.0.insert("max_uses".to_owned(), Value::Number(Number::from(max_uses)));
+        self.0
+            .insert("max_uses".to_owned(), Value::Number(Number::from(max_uses)));
 
         self
     }
@@ -153,7 +155,8 @@ impl CreateInvite {
     /// # }
     /// ```
     pub fn temporary(mut self, temporary: bool) -> Self {
-        self.0.insert("temporary".to_owned(), Value::Bool(temporary));
+        self.0
+            .insert("temporary".to_owned(), Value::Bool(temporary));
 
         self
     }
diff --git a/src/builder/create_message.rs b/src/builder/create_message.rs
index e9e8bf5..c5a3cc3 100644
--- a/src/builder/create_message.rs
+++ b/src/builder/create_message.rs
@@ -1,6 +1,6 @@
 use super::CreateEmbed;
-use ::model::ReactionType;
-use ::internal::prelude::*;
+use model::ReactionType;
+use internal::prelude::*;
 
 /// A builder to specify the contents of an [`http::send_message`] request,
 /// primarily meant for use through [`ChannelId::send_message`].
@@ -45,14 +45,16 @@ impl CreateMessage {
     ///
     /// **Note**: Message contents must be under 2000 unicode code points.
     pub fn content(mut self, content: &str) -> Self {
-        self.0.insert("content".to_owned(), Value::String(content.to_owned()));
+        self.0
+            .insert("content".to_owned(), Value::String(content.to_owned()));
 
         CreateMessage(self.0, self.1)
     }
 
     /// Set an embed for the message.
     pub fn embed<F>(mut self, f: F) -> Self
-        where F: FnOnce(CreateEmbed) -> CreateEmbed {
+    where
+        F: FnOnce(CreateEmbed) -> CreateEmbed, {
         let embed = Value::Object(f(CreateEmbed::default()).0);
 
         self.0.insert("embed".to_owned(), embed);
diff --git a/src/builder/edit_channel.rs b/src/builder/edit_channel.rs
index 9d859c7..5537b48 100644
--- a/src/builder/edit_channel.rs
+++ b/src/builder/edit_channel.rs
@@ -1,4 +1,4 @@
-use ::internal::prelude::*;
+use internal::prelude::*;
 
 /// A builder to edit a [`GuildChannel`] for use via [`GuildChannel::edit`]
 ///
@@ -27,7 +27,8 @@ impl EditChannel {
     ///
     /// [voice]: ../model/enum.ChannelType.html#variant.Voice
     pub fn bitrate(mut self, bitrate: u64) -> Self {
-        self.0.insert("bitrate".to_owned(), Value::Number(Number::from(bitrate)));
+        self.0
+            .insert("bitrate".to_owned(), Value::Number(Number::from(bitrate)));
 
         self
     }
@@ -36,14 +37,16 @@ impl EditChannel {
     ///
     /// Must be between 2 and 100 characters long.
     pub fn name(mut self, name: &str) -> Self {
-        self.0.insert("name".to_owned(), Value::String(name.to_owned()));
+        self.0
+            .insert("name".to_owned(), Value::String(name.to_owned()));
 
         self
     }
 
     /// The position of the channel in the channel list.
     pub fn position(mut self, position: u64) -> Self {
-        self.0.insert("position".to_owned(), Value::Number(Number::from(position)));
+        self.0
+            .insert("position".to_owned(), Value::Number(Number::from(position)));
 
         self
     }
@@ -56,7 +59,8 @@ impl EditChannel {
     ///
     /// [text]: ../model/enum.ChannelType.html#variant.Text
     pub fn topic(mut self, topic: &str) -> Self {
-        self.0.insert("topic".to_owned(), Value::String(topic.to_owned()));
+        self.0
+            .insert("topic".to_owned(), Value::String(topic.to_owned()));
 
         self
     }
@@ -67,7 +71,8 @@ impl EditChannel {
     ///
     /// [voice]: ../model/enum.ChannelType.html#variant.Voice
     pub fn user_limit(mut self, user_limit: u64) -> Self {
-        self.0.insert("user_limit".to_owned(), Value::Number(Number::from(user_limit)));
+        self.0.insert("user_limit".to_owned(),
+                      Value::Number(Number::from(user_limit)));
 
         self
     }
diff --git a/src/builder/edit_guild.rs b/src/builder/edit_guild.rs
index e74e54e..67b0003 100644
--- a/src/builder/edit_guild.rs
+++ b/src/builder/edit_guild.rs
@@ -1,5 +1,5 @@
-use ::internal::prelude::*;
-use ::model::{ChannelId, Region, UserId, VerificationLevel};
+use internal::prelude::*;
+use model::{ChannelId, Region, UserId, VerificationLevel};
 
 /// A builder to optionally edit certain fields of a [`Guild`]. This is meant
 /// for usage with [`Guild::edit`].
@@ -36,7 +36,8 @@ impl EditGuild {
     ///
     /// [`afk_channel`]: #method.afk_channel
     pub fn afk_timeout(mut self, timeout: u64) -> Self {
-        self.0.insert("afk_timeout".to_owned(), Value::Number(Number::from(timeout)));
+        self.0.insert("afk_timeout".to_owned(),
+                      Value::Number(Number::from(timeout)));
 
         self
     }
@@ -71,7 +72,8 @@ impl EditGuild {
     ///
     /// [`utils::read_image`]: ../utils/fn.read_image.html
     pub fn icon(mut self, icon: Option<&str>) -> Self {
-        self.0.insert("icon".to_owned(), icon.map_or_else(|| Value::Null, |x| Value::String(x.to_owned())));
+        self.0.insert("icon".to_owned(),
+                      icon.map_or_else(|| Value::Null, |x| Value::String(x.to_owned())));
 
         self
     }
@@ -80,7 +82,8 @@ impl EditGuild {
     ///
     /// **Note**: Must be between (and including) 2-100 chracters.
     pub fn name(mut self, name: &str) -> Self {
-        self.0.insert("name".to_owned(), Value::String(name.to_owned()));
+        self.0
+            .insert("name".to_owned(), Value::String(name.to_owned()));
 
         self
     }
@@ -89,7 +92,8 @@ impl EditGuild {
     ///
     /// **Note**: The current user must be the owner of the guild.
     pub fn owner<U: Into<UserId>>(mut self, user_id: U) -> Self {
-        self.0.insert("owner_id".to_owned(), Value::Number(Number::from(user_id.into().0)));
+        self.0.insert("owner_id".to_owned(),
+                      Value::Number(Number::from(user_id.into().0)));
 
         self
     }
@@ -121,7 +125,8 @@ impl EditGuild {
     ///
     /// [`Region::UsWest`]: ../model/enum.Region.html#variant.UsWest
     pub fn region(mut self, region: Region) -> Self {
-        self.0.insert("region".to_owned(), Value::String(region.name().to_owned()));
+        self.0
+            .insert("region".to_owned(), Value::String(region.name().to_owned()));
 
         self
     }
@@ -172,7 +177,8 @@ impl EditGuild {
     /// [`VerificationLevel`]: ../model/enum.VerificationLevel.html
     /// [`VerificationLevel::High`]: ../model/enum.VerificationLevel.html#variant.High
     pub fn verification_level<V>(mut self, verification_level: V) -> Self
-        where V: Into<VerificationLevel> {
+    where
+        V: Into<VerificationLevel>, {
         let num = Value::Number(Number::from(verification_level.into().num()));
 
         self.0.insert("verification_level".to_owned(), num);
diff --git a/src/builder/edit_member.rs b/src/builder/edit_member.rs
index 3fce146..a88ae17 100644
--- a/src/builder/edit_member.rs
+++ b/src/builder/edit_member.rs
@@ -1,5 +1,5 @@
-use ::model::{ChannelId, RoleId};
-use ::internal::prelude::*;
+use model::{ChannelId, RoleId};
+use internal::prelude::*;
 
 /// A builder which edits the properties of a [`Member`], to be used in
 /// conjunction with [`Member::edit`].
@@ -39,7 +39,8 @@ impl EditMember {
     ///
     /// [Manage Nicknames]: ../model/permissions/constant.MANAGE_NICKNAMES.html
     pub fn nickname(mut self, nickname: &str) -> Self {
-        self.0.insert("nick".to_owned(), Value::String(nickname.to_owned()));
+        self.0
+            .insert("nick".to_owned(), Value::String(nickname.to_owned()));
 
         self
     }
@@ -50,7 +51,10 @@ impl EditMember {
     ///
     /// [Manage Roles]: ../model/permissions/constant.MANAGE_ROLES.html
     pub fn roles(mut self, roles: &[RoleId]) -> Self {
-        let role_ids = roles.iter().map(|x| Value::Number(Number::from(x.0))).collect();
+        let role_ids = roles
+            .iter()
+            .map(|x| Value::Number(Number::from(x.0)))
+            .collect();
 
         self.0.insert("roles".to_owned(), Value::Array(role_ids));
 
@@ -63,7 +67,8 @@ impl EditMember {
     ///
     /// [Move Members]: ../model/permissions/constant.MOVE_MEMBERS.html
     pub fn voice_channel<C: Into<ChannelId>>(mut self, channel_id: C) -> Self {
-        self.0.insert("channel_id".to_owned(), Value::Number(Number::from(channel_id.into().0)));
+        self.0.insert("channel_id".to_owned(),
+                      Value::Number(Number::from(channel_id.into().0)));
 
         self
     }
diff --git a/src/builder/edit_profile.rs b/src/builder/edit_profile.rs
index 2b54f68..63daec3 100644
--- a/src/builder/edit_profile.rs
+++ b/src/builder/edit_profile.rs
@@ -1,4 +1,4 @@
-use ::internal::prelude::*;
+use internal::prelude::*;
 
 /// A builder to edit the current user's settings, to be used in conjunction
 /// with [`CurrentUser::edit`].
@@ -61,7 +61,8 @@ impl EditProfile {
     ///
     /// [provided]: #method.password
     pub fn email(mut self, email: &str) -> Self {
-        self.0.insert("email".to_owned(), Value::String(email.to_owned()));
+        self.0
+            .insert("email".to_owned(), Value::String(email.to_owned()));
 
         self
     }
@@ -73,7 +74,8 @@ impl EditProfile {
     ///
     /// [provided]: #method.password
     pub fn new_password(mut self, new_password: &str) -> Self {
-        self.0.insert("new_password".to_owned(), Value::String(new_password.to_owned()));
+        self.0.insert("new_password".to_owned(),
+                      Value::String(new_password.to_owned()));
 
         self
     }
@@ -84,7 +86,8 @@ impl EditProfile {
     /// [modifying the password]: #method.new_password
     /// [modifying the associated email address]: #method.email
     pub fn password(mut self, password: &str) -> Self {
-        self.0.insert("password".to_owned(), Value::String(password.to_owned()));
+        self.0
+            .insert("password".to_owned(), Value::String(password.to_owned()));
 
         self
     }
@@ -96,7 +99,8 @@ impl EditProfile {
     /// If there are no available discriminators with the requested username,
     /// an error will occur.
     pub fn username(mut self, username: &str) -> Self {
-        self.0.insert("username".to_owned(), Value::String(username.to_owned()));
+        self.0
+            .insert("username".to_owned(), Value::String(username.to_owned()));
 
         self
     }
diff --git a/src/builder/edit_role.rs b/src/builder/edit_role.rs
index 6be09fe..28aecac 100644
--- a/src/builder/edit_role.rs
+++ b/src/builder/edit_role.rs
@@ -1,6 +1,6 @@
 use std::default::Default;
-use ::internal::prelude::*;
-use ::model::{Permissions, Role, permissions};
+use internal::prelude::*;
+use model::{permissions, Permissions, Role};
 
 /// A builer to create or edit a [`Role`] for use via a number of model methods.
 ///
@@ -48,12 +48,13 @@ impl EditRole {
     pub fn new(role: &Role) -> Self {
         let mut map = Map::new();
 
-        #[cfg(feature="utils")]
+        #[cfg(feature = "utils")]
         {
-            map.insert("color".to_owned(), Value::Number(Number::from(role.colour.0)));
+            map.insert("color".to_owned(),
+                       Value::Number(Number::from(role.colour.0)));
         }
 
-        #[cfg(not(feature="utils"))]
+        #[cfg(not(feature = "utils"))]
         {
             map.insert("color".to_owned(), Value::Number(Number::from(role.colour)));
         }
@@ -62,15 +63,18 @@ impl EditRole {
         map.insert("managed".to_owned(), Value::Bool(role.managed));
         map.insert("mentionable".to_owned(), Value::Bool(role.mentionable));
         map.insert("name".to_owned(), Value::String(role.name.clone()));
-        map.insert("permissions".to_owned(), Value::Number(Number::from(role.permissions.bits())));
-        map.insert("position".to_owned(), Value::Number(Number::from(role.position)));
+        map.insert("permissions".to_owned(),
+                   Value::Number(Number::from(role.permissions.bits())));
+        map.insert("position".to_owned(),
+                   Value::Number(Number::from(role.position)));
 
         EditRole(map)
     }
 
     /// Sets the colour of the role.
     pub fn colour(mut self, colour: u64) -> Self {
-        self.0.insert("color".to_owned(), Value::Number(Number::from(colour)));
+        self.0
+            .insert("color".to_owned(), Value::Number(Number::from(colour)));
 
         self
     }
@@ -85,21 +89,24 @@ impl EditRole {
 
     /// Whether or not to make the role mentionable, notifying its users.
     pub fn mentionable(mut self, mentionable: bool) -> Self {
-        self.0.insert("mentionable".to_owned(), Value::Bool(mentionable));
+        self.0
+            .insert("mentionable".to_owned(), Value::Bool(mentionable));
 
         self
     }
 
     /// The name of the role to set.
     pub fn name(mut self, name: &str) -> Self {
-        self.0.insert("name".to_owned(), Value::String(name.to_owned()));
+        self.0
+            .insert("name".to_owned(), Value::String(name.to_owned()));
 
         self
     }
 
     /// The set of permissions to assign the role.
     pub fn permissions(mut self, permissions: Permissions) -> Self {
-        self.0.insert("permissions".to_owned(), Value::Number(Number::from(permissions.bits())));
+        self.0.insert("permissions".to_owned(),
+                      Value::Number(Number::from(permissions.bits())));
 
         self
     }
@@ -107,7 +114,8 @@ impl EditRole {
     /// The position to assign the role in the role list. This correlates to the
     /// role's position in the user list.
     pub fn position(mut self, position: u8) -> Self {
-        self.0.insert("position".to_owned(), Value::Number(Number::from(position)));
+        self.0
+            .insert("position".to_owned(), Value::Number(Number::from(position)));
 
         self
     }
diff --git a/src/builder/execute_webhook.rs b/src/builder/execute_webhook.rs
index e8b9042..9a0c9d9 100644
--- a/src/builder/execute_webhook.rs
+++ b/src/builder/execute_webhook.rs
@@ -1,6 +1,6 @@
 use serde_json::Value;
 use std::default::Default;
-use ::internal::prelude::*;
+use internal::prelude::*;
 
 /// A builder to create the inner content of a [`Webhook`]'s execution.
 ///
@@ -74,7 +74,8 @@ impl ExecuteWebhook {
     ///     .content("Here's a webhook"));
     /// ```
     pub fn avatar_url(mut self, avatar_url: &str) -> Self {
-        self.0.insert("avatar_url".to_owned(), Value::String(avatar_url.to_owned()));
+        self.0.insert("avatar_url".to_owned(),
+                      Value::String(avatar_url.to_owned()));
 
         self
     }
@@ -100,7 +101,8 @@ impl ExecuteWebhook {
     ///
     /// [`embeds`]: #method.embeds
     pub fn content(mut self, content: &str) -> Self {
-        self.0.insert("content".to_owned(), Value::String(content.to_owned()));
+        self.0
+            .insert("content".to_owned(), Value::String(content.to_owned()));
 
         self
     }
@@ -161,7 +163,8 @@ impl ExecuteWebhook {
     /// }
     /// ```
     pub fn username(mut self, username: &str) -> Self {
-        self.0.insert("username".to_owned(), Value::String(username.to_owned()));
+        self.0
+            .insert("username".to_owned(), Value::String(username.to_owned()));
 
         self
     }
diff --git a/src/builder/get_messages.rs b/src/builder/get_messages.rs
index 193adca..bca2f0e 100644
--- a/src/builder/get_messages.rs
+++ b/src/builder/get_messages.rs
@@ -1,5 +1,5 @@
 use std::collections::BTreeMap;
-use ::model::MessageId;
+use model::MessageId;
 
 /// Builds a request for a request to the API to retrieve messages.
 ///
@@ -85,11 +85,8 @@ impl GetMessages {
     /// limitation. If an amount larger than 100 is supplied, it will be
     /// reduced.
     pub fn limit(mut self, limit: u64) -> Self {
-        self.0.insert("limit".to_owned(), if limit > 100 {
-            100
-        } else {
-            limit
-        });
+        self.0
+            .insert("limit".to_owned(), if limit > 100 { 100 } else { limit });
 
         self
     }
@@ -97,7 +94,5 @@ impl GetMessages {
     /// This is a function that is here for completeness. You do not need to
     /// call this - except to clear previous calls to `after`, `around`, and
     /// `before` - as it is the default value.
-    pub fn most_recent(self) -> Self {
-        self
-    }
+    pub fn most_recent(self) -> Self { self }
 }
diff --git a/src/builder/mod.rs b/src/builder/mod.rs
index 3fc0f05..496d7e1 100644
--- a/src/builder/mod.rs
+++ b/src/builder/mod.rs
@@ -16,12 +16,7 @@ mod edit_role;
 mod execute_webhook;
 mod get_messages;
 
-pub use self::create_embed::{
-    CreateEmbed,
-    CreateEmbedAuthor,
-    CreateEmbedFooter,
-    CreateEmbedField,
-};
+pub use self::create_embed::{CreateEmbed, CreateEmbedAuthor, CreateEmbedField, CreateEmbedFooter};
 pub use self::create_invite::CreateInvite;
 pub use self::create_message::CreateMessage;
 pub use self::edit_channel::EditChannel;