Change the config a bit, and a few nitpicks

8 files changed, 68 insertions, 43 deletions

diff --git a/src/builder/create_embed.rs b/src/builder/create_embed.rs
index c0dead6..0d848ee 100644
--- a/src/builder/create_embed.rs
+++ b/src/builder/create_embed.rs
@@ -47,8 +47,7 @@ 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));
@@ -68,8 +67,10 @@ impl CreateEmbed {
     /// Set the colour of the left-hand side of the embed.
     #[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)
     }
@@ -96,8 +97,10 @@ 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,8 +116,7 @@ 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;
 
         {
@@ -170,8 +172,7 @@ 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));
@@ -352,7 +353,9 @@ 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 {
@@ -513,8 +516,7 @@ impl<'a> From<&'a str> for Timestamp {
 }
 
 impl<'a, Tz: TimeZone> From<&'a DateTime<Tz>> for Timestamp
-where
-    Tz::Offset: Display, {
+    where Tz::Offset: Display {
     fn from(dt: &'a DateTime<Tz>) -> Self {
         Timestamp {
             ts: dt.to_rfc3339(),
diff --git a/src/builder/create_message.rs b/src/builder/create_message.rs
index c5a3cc3..c472ab6 100644
--- a/src/builder/create_message.rs
+++ b/src/builder/create_message.rs
@@ -53,8 +53,7 @@ impl CreateMessage {
 
     /// 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 5537b48..e3bf78e 100644
--- a/src/builder/edit_channel.rs
+++ b/src/builder/edit_channel.rs
@@ -71,8 +71,10 @@ 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 67b0003..f88db2a 100644
--- a/src/builder/edit_guild.rs
+++ b/src/builder/edit_guild.rs
@@ -23,10 +23,13 @@ impl EditGuild {
     ///
     /// [`afk_timeout`]: #method.afk_timeout
     pub fn afk_channel<C: Into<ChannelId>>(mut self, channel: Option<C>) -> Self {
-        self.0.insert("afk_channel_id".to_owned(), match channel {
-            Some(channel) => Value::Number(Number::from(channel.into().0)),
-            None => Value::Null,
-        });
+        self.0.insert(
+            "afk_channel_id".to_owned(),
+            match channel {
+                Some(channel) => Value::Number(Number::from(channel.into().0)),
+                None => Value::Null,
+            },
+        );
 
         self
     }
@@ -36,8 +39,10 @@ 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
     }
@@ -72,8 +77,10 @@ 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
     }
@@ -92,8 +99,10 @@ 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
     }
@@ -177,8 +186,7 @@ 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 a88ae17..23bf1f2 100644
--- a/src/builder/edit_member.rs
+++ b/src/builder/edit_member.rs
@@ -67,8 +67,10 @@ 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 63daec3..6aa4e78 100644
--- a/src/builder/edit_profile.rs
+++ b/src/builder/edit_profile.rs
@@ -74,8 +74,10 @@ 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
     }
diff --git a/src/builder/edit_role.rs b/src/builder/edit_role.rs
index 28aecac..bece07c 100644
--- a/src/builder/edit_role.rs
+++ b/src/builder/edit_role.rs
@@ -50,8 +50,10 @@ impl EditRole {
 
         #[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"))]
@@ -63,10 +65,14 @@ 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)
     }
@@ -105,8 +111,10 @@ impl EditRole {
 
     /// 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
     }
diff --git a/src/builder/execute_webhook.rs b/src/builder/execute_webhook.rs
index 9a0c9d9..0cb276c 100644
--- a/src/builder/execute_webhook.rs
+++ b/src/builder/execute_webhook.rs
@@ -74,8 +74,10 @@ 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
     }