Re-order use statements alphabetically

20 files changed, 62 insertions, 72 deletions

diff --git a/src/model/channel/attachment.rs b/src/model/channel/attachment.rs
index f520cd4..1836498 100644
--- a/src/model/channel/attachment.rs
+++ b/src/model/channel/attachment.rs
@@ -1,9 +1,9 @@
 #[cfg(feature = "model")]
 use hyper::Client as HyperClient;
 #[cfg(feature = "model")]
-use std::io::Read;
-#[cfg(feature = "model")]
 use internal::prelude::*;
+#[cfg(feature = "model")]
+use std::io::Read;
 
 /// A file uploaded with a message. Not to be confused with [`Embed`]s.
 ///
diff --git a/src/model/channel/channel_id.rs b/src/model/channel/channel_id.rs
index 158ebcf..acd3704 100644
--- a/src/model/channel/channel_id.rs
+++ b/src/model/channel/channel_id.rs
@@ -1,5 +1,5 @@
-use model::*;
 use internal::RwLockExt;
+use model::*;
 
 #[cfg(feature = "model")]
 use std::borrow::Cow;
@@ -124,7 +124,7 @@ impl ChannelId {
             .into_iter()
             .map(|message_id| message_id.as_ref().0)
             .collect::<Vec<u64>>();
-        
+
         if ids.len() == 1 {
             self.delete_message(ids[0])
         } else {
diff --git a/src/model/channel/embed.rs b/src/model/channel/embed.rs
index 401f10d..a839beb 100644
--- a/src/model/channel/embed.rs
+++ b/src/model/channel/embed.rs
@@ -1,10 +1,10 @@
-#[cfg(feature = "utils")]
-use utils::Colour;
-#[cfg(feature = "model")]
-use internal::prelude::*;
 #[cfg(feature = "model")]
 use builder::CreateEmbed;
 #[cfg(feature = "model")]
+use internal::prelude::*;
+#[cfg(feature = "utils")]
+use utils::Colour;
+#[cfg(feature = "model")]
 use utils;
 
 /// Represents a rich embed which allows using richer markdown, multiple fields
diff --git a/src/model/channel/guild_channel.rs b/src/model/channel/guild_channel.rs
index 76cea47..54f802d 100644
--- a/src/model/channel/guild_channel.rs
+++ b/src/model/channel/guild_channel.rs
@@ -1,10 +1,6 @@
 use chrono::{DateTime, FixedOffset};
 use model::*;
 
-#[cfg(feature = "model")]
-use std::fmt::{Display, Formatter, Result as FmtResult};
-#[cfg(feature = "model")]
-use std::mem;
 #[cfg(all(feature = "cache", feature = "model"))]
 use CACHE;
 #[cfg(feature = "model")]
@@ -13,6 +9,10 @@ use builder::{CreateInvite, CreateMessage, EditChannel, GetMessages};
 use http::{self, AttachmentType};
 #[cfg(all(feature = "cache", feature = "model"))]
 use internal::prelude::*;
+#[cfg(feature = "model")]
+use std::fmt::{Display, Formatter, Result as FmtResult};
+#[cfg(feature = "model")]
+use std::mem;
 #[cfg(all(feature = "model", feature = "utils"))]
 use utils as serenity_utils;
 
diff --git a/src/model/channel/message.rs b/src/model/channel/message.rs
index 984e274..8dcaccb 100644
--- a/src/model/channel/message.rs
+++ b/src/model/channel/message.rs
@@ -1,21 +1,17 @@
 use chrono::{DateTime, FixedOffset};
-use serde_json::Value;
 use model::*;
+use serde_json::Value;
 
-#[cfg(all(feature = "cache", feature = "model"))]
-use std::fmt::Write;
-#[cfg(feature = "model")]
-use std::mem;
 #[cfg(feature = "model")]
 use builder::{CreateEmbed, CreateMessage};
-#[cfg(feature = "model")]
-use constants;
 #[cfg(all(feature = "cache", feature = "model"))]
 use CACHE;
+#[cfg(all(feature = "cache", feature = "model"))]
+use std::fmt::Write;
 #[cfg(feature = "model")]
-use http;
+use std::mem;
 #[cfg(feature = "model")]
-use utils as serenity_utils;
+use {constants, http, utils as serenity_utils};
 
 /// A representation of a message over a guild's text channel, a group, or a
 /// private channel.
diff --git a/src/model/channel/mod.rs b/src/model/channel/mod.rs
index ae46805..2fc4cbc 100644
--- a/src/model/channel/mod.rs
+++ b/src/model/channel/mod.rs
@@ -19,17 +19,17 @@ pub use self::reaction::*;
 pub use self::channel_category::*;
 
 use internal::RwLockExt;
+use model::*;
 use serde::de::Error as DeError;
 use serde_json;
 use super::utils::deserialize_u64;
-use model::*;
 
 #[cfg(feature = "model")]
-use std::fmt::{Display, Formatter, Result as FmtResult};
-#[cfg(feature = "model")]
 use builder::{CreateMessage, GetMessages};
 #[cfg(feature = "model")]
 use http::AttachmentType;
+#[cfg(feature = "model")]
+use std::fmt::{Display, Formatter, Result as FmtResult};
 
 /// A container for any channel.
 #[derive(Clone, Debug)]
diff --git a/src/model/channel/private_channel.rs b/src/model/channel/private_channel.rs
index 01b387a..80a59bb 100644
--- a/src/model/channel/private_channel.rs
+++ b/src/model/channel/private_channel.rs
@@ -1,7 +1,7 @@
 use chrono::{DateTime, FixedOffset};
+use model::*;
 use std::fmt::{Display, Formatter, Result as FmtResult};
 use super::deserialize_single_recipient;
-use model::*;
 
 #[cfg(feature = "model")]
 use builder::{CreateMessage, GetMessages};
diff --git a/src/model/channel/reaction.rs b/src/model/channel/reaction.rs
index 69116d7..7b93716 100644
--- a/src/model/channel/reaction.rs
+++ b/src/model/channel/reaction.rs
@@ -1,9 +1,9 @@
+use model::*;
 use serde::de::{Deserialize, Error as DeError, MapAccess, Visitor};
+use std::error::Error as StdError;
 use std::fmt::{Display, Formatter, Result as FmtResult, Write as FmtWrite};
 use std::str::FromStr;
-use std::error::Error as StdError;
 use internal::prelude::*;
-use model::*;
 
 #[cfg(all(feature = "cache", feature = "model"))]
 use CACHE;
diff --git a/src/model/event.rs b/src/model/event.rs
index aea05b1..4e71101 100644
--- a/src/model/event.rs
+++ b/src/model/event.rs
@@ -10,19 +10,19 @@ use super::utils::deserialize_emojis;
 use super::*;
 use constants::VoiceOpCode;
 use internal::prelude::*;
+
 #[cfg(feature = "cache")]
 use cache::{Cache, CacheUpdate};
-#[cfg(feature = "cache")]
-use internal::RwLockExt;
-#[cfg(feature = "cache")]
-use std::mem;
-#[cfg(feature = "cache")]
-use std::collections::hash_map::Entry;
-
 #[cfg(feature = "gateway")]
 use constants::OpCode;
 #[cfg(feature = "gateway")]
 use gateway::GatewayError;
+#[cfg(feature = "cache")]
+use internal::RwLockExt;
+#[cfg(feature = "cache")]
+use std::collections::hash_map::Entry;
+#[cfg(feature = "cache")]
+use std::mem;
 
 /// Event data for the channel creation event.
 ///
diff --git a/src/model/guild/audit_log.rs b/src/model/guild/audit_log.rs
index b3caa73..51138e0 100644
--- a/src/model/guild/audit_log.rs
+++ b/src/model/guild/audit_log.rs
@@ -1,8 +1,8 @@
-use super::super::{AuditLogEntryId, User, UserId, ChannelId, Webhook};
 use serde::de::{self, Deserialize, Deserializer, MapAccess, Visitor};
-use std::fmt;
+use super::super::{AuditLogEntryId, User, UserId, ChannelId, Webhook};
 use std::collections::HashMap;
 use std::mem::transmute;
+use std::fmt;
 
 /// Determines to what entity an action was used on.
 #[derive(Debug)]
diff --git a/src/model/guild/emoji.rs b/src/model/guild/emoji.rs
index 7f332ae..31d2a1f 100644
--- a/src/model/guild/emoji.rs
+++ b/src/model/guild/emoji.rs
@@ -2,17 +2,15 @@ use std::fmt::{Display, Formatter, Result as FmtResult, Write as FmtWrite};
 use super::super::{EmojiId, RoleId};
 
 #[cfg(all(feature = "cache", feature = "model"))]
+use internal::prelude::*;
+#[cfg(all(feature = "cache", feature = "model"))]
 use std::mem;
 #[cfg(all(feature = "cache", feature = "model"))]
 use super::super::ModelError;
 #[cfg(all(feature = "cache", feature = "model"))]
-use CACHE;
-#[cfg(all(feature = "cache", feature = "model"))]
-use internal::prelude::*;
-#[cfg(all(feature = "cache", feature = "model"))]
-use http;
-#[cfg(all(feature = "cache", feature = "model"))]
 use super::super::GuildId;
+#[cfg(all(feature = "cache", feature = "model"))]
+use {CACHE, http};
 
 /// Represents a custom guild emoji, which can either be created using the API,
 /// or via an integration. Emojis created using the API only work within the
diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs
index 2c31bc3..74b0f69 100644
--- a/src/model/guild/member.rs
+++ b/src/model/guild/member.rs
@@ -1,14 +1,14 @@
+use model::*;
 use chrono::{DateTime, FixedOffset};
 use std::fmt::{Display, Formatter, Result as FmtResult};
 use super::deserialize_sync_user;
-use model::*;
 
-#[cfg(feature = "model")]
-use std::borrow::Cow;
-#[cfg(all(feature = "cache", feature = "model"))]
-use internal::prelude::*;
 #[cfg(all(feature = "builder", feature = "cache", feature = "model"))]
 use builder::EditMember;
+#[cfg(all(feature = "cache", feature = "model"))]
+use internal::prelude::*;
+#[cfg(feature = "model")]
+use std::borrow::Cow;
 #[cfg(all(feature = "cache", feature = "model", feature = "utils"))]
 use utils::Colour;
 #[cfg(all(feature = "cache", feature = "model"))]
diff --git a/src/model/guild/mod.rs b/src/model/guild/mod.rs
index 1e0ef7c..fe2150a 100644
--- a/src/model/guild/mod.rs
+++ b/src/model/guild/mod.rs
@@ -15,10 +15,10 @@ pub use self::role::*;
 pub use self::audit_log::*;
 
 use chrono::{DateTime, FixedOffset};
+use model::*;
 use serde::de::Error as DeError;
 use serde_json;
 use super::utils::*;
-use model::*;
 
 #[cfg(all(feature = "cache", feature = "model"))]
 use CACHE;
@@ -242,11 +242,11 @@ impl Guild {
     ///
     /// [`AuditLogs`]: audit_log/struct.AuditLogs.html
     #[inline]
-    pub fn audit_logs(&self, action_type: Option<u8>, 
-                             user_id: Option<UserId>, 
+    pub fn audit_logs(&self, action_type: Option<u8>,
+                             user_id: Option<UserId>,
                              before: Option<AuditLogEntryId>,
-                             limit: Option<u8>) -> Result<AuditLogs> { 
-        self.id.audit_logs(action_type, user_id, before, limit) 
+                             limit: Option<u8>) -> Result<AuditLogs> {
+        self.id.audit_logs(action_type, user_id, before, limit)
     }
 
     /// Gets all of the guild's channels over the REST API.
diff --git a/src/model/guild/partial_guild.rs b/src/model/guild/partial_guild.rs
index c4181fd..c33c8d0 100644
--- a/src/model/guild/partial_guild.rs
+++ b/src/model/guild/partial_guild.rs
@@ -1,5 +1,5 @@
-use super::super::utils::{deserialize_emojis, deserialize_roles};
 use model::*;
+use super::super::utils::{deserialize_emojis, deserialize_roles};
 
 #[cfg(feature = "model")]
 use builder::{EditGuild, EditMember, EditRole};
diff --git a/src/model/guild/role.rs b/src/model/guild/role.rs
index 3ed718e..97a9cf6 100644
--- a/src/model/guild/role.rs
+++ b/src/model/guild/role.rs
@@ -1,14 +1,12 @@
-use std::cmp::Ordering;
 use model::*;
+use std::cmp::Ordering;
 
-#[cfg(all(feature = "cache", feature = "model"))]
-use CACHE;
 #[cfg(all(feature = "builder", feature = "cache", feature = "model"))]
 use builder::EditRole;
 #[cfg(all(feature = "cache", feature = "model"))]
 use internal::prelude::*;
 #[cfg(all(feature = "cache", feature = "model"))]
-use http;
+use {CACHE, http};
 
 /// Information about a role within a guild. A role represents a set of
 /// permissions, and can be attached to one or multiple users. A role has
diff --git a/src/model/invite.rs b/src/model/invite.rs
index 8ef848c..8e5c18b 100644
--- a/src/model/invite.rs
+++ b/src/model/invite.rs
@@ -1,12 +1,12 @@
 use chrono::{DateTime, FixedOffset};
 use super::*;
 
-#[cfg(all(feature = "cache", feature = "model"))]
-use super::{Permissions, utils as model_utils};
 #[cfg(feature = "model")]
 use builder::CreateInvite;
 #[cfg(feature = "model")]
 use internal::prelude::*;
+#[cfg(all(feature = "cache", feature = "model"))]
+use super::{Permissions, utils as model_utils};
 #[cfg(feature = "model")]
 use {http, utils};
 
diff --git a/src/model/misc.rs b/src/model/misc.rs
index 51c304d..0f191bc 100644
--- a/src/model/misc.rs
+++ b/src/model/misc.rs
@@ -2,15 +2,13 @@ use super::*;
 use internal::RwLockExt;
 
 #[cfg(all(feature = "model", feature = "utils"))]
-use std::result::Result as StdResult;
-#[cfg(all(feature = "model", feature = "utils"))]
 use std::error::Error as StdError;
 #[cfg(all(feature = "model", feature = "utils"))]
+use std::result::Result as StdResult;
+#[cfg(all(feature = "model", feature = "utils"))]
 use std::str::FromStr;
 #[cfg(all(feature = "model", feature = "utils"))]
 use std::fmt;
-#[cfg(all(feature = "model", feature = "utils"))]
-use std::error::Error;
 #[cfg(all(feature = "model", any(feature = "cache", feature = "utils")))]
 use utils;
 
diff --git a/src/model/mod.rs b/src/model/mod.rs
index 64987e1..5d47ccb 100644
--- a/src/model/mod.rs
+++ b/src/model/mod.rs
@@ -32,13 +32,13 @@ pub use self::voice::*;
 pub use self::webhook::*;
 
 use chrono::NaiveDateTime;
+use internal::prelude::*;
 use parking_lot::RwLock;
 use self::utils::*;
 use serde::de::Visitor;
 use std::collections::HashMap;
 use std::fmt::{Display, Formatter, Result as FmtResult};
 use std::sync::Arc;
-use internal::prelude::*;
 
 #[cfg(feature = "utils")]
 use utils::Colour;
diff --git a/src/model/user.rs b/src/model/user.rs
index 9f36d0f..c319775 100644
--- a/src/model/user.rs
+++ b/src/model/user.rs
@@ -5,8 +5,14 @@ use super::*;
 use internal::prelude::*;
 use model::misc::Mentionable;
 
+#[cfg(all(feature = "cache", feature = "model"))]
+use CACHE;
+#[cfg(feature = "model")]
+use builder::{CreateMessage, EditProfile};
 #[cfg(feature = "model")]
 use chrono::NaiveDateTime;
+#[cfg(feature = "model")]
+use http::{self, GuildPagination};
 #[cfg(all(feature = "cache", feature = "model"))]
 use parking_lot::RwLock;
 #[cfg(feature = "model")]
@@ -16,12 +22,6 @@ use std::mem;
 #[cfg(all(feature = "cache", feature = "model"))]
 use std::sync::Arc;
 #[cfg(feature = "model")]
-use builder::{CreateMessage, EditProfile};
-#[cfg(all(feature = "cache", feature = "model"))]
-use CACHE;
-#[cfg(feature = "model")]
-use http::{self, GuildPagination};
-#[cfg(feature = "model")]
 use utils;
 
 /// Information about the current user.
diff --git a/src/model/webhook.rs b/src/model/webhook.rs
index e00d018..2bb1c49 100644
--- a/src/model/webhook.rs
+++ b/src/model/webhook.rs
@@ -1,12 +1,12 @@
 use super::*;
 
 #[cfg(feature = "model")]
-use std::mem;
-#[cfg(feature = "model")]
 use builder::ExecuteWebhook;
 #[cfg(feature = "model")]
 use internal::prelude::*;
 #[cfg(feature = "model")]
+use std::mem;
+#[cfg(feature = "model")]
 use {http, utils};
 
 /// A representation of a webhook, which is a low-effort way to post messages to