Refactor imports/exports to use nested groups and better formatting

14 files changed, 107 insertions, 30 deletions

diff --git a/src/model/application.rs b/src/model/application.rs
index 47bbfb8..894e8df 100644
--- a/src/model/application.rs
+++ b/src/model/application.rs
@@ -1,8 +1,10 @@
 //! Models about OAuth2 applications.
 
-use super::id::UserId;
-use super::user::User;
-use super::utils::default_true;
+use super::{
+    id::UserId,
+    user::User,
+    utils::default_true
+};
 
 /// Information about a user's application. An application does not necessarily
 /// have an associated bot user.
diff --git a/src/model/channel/channel_id.rs b/src/model/channel/channel_id.rs
index d460190..78bfbd7 100644
--- a/src/model/channel/channel_id.rs
+++ b/src/model/channel/channel_id.rs
@@ -6,7 +6,12 @@ use std::borrow::Cow;
 #[cfg(feature = "model")]
 use std::fmt::Write as FmtWrite;
 #[cfg(feature = "model")]
-use builder::{CreateMessage, EditChannel, EditMessage, GetMessages};
+use builder::{
+    CreateMessage, 
+    EditChannel, 
+    EditMessage, 
+    GetMessages
+};
 #[cfg(all(feature = "cache", feature = "model"))]
 use CACHE;
 #[cfg(feature = "model")]
diff --git a/src/model/channel/group.rs b/src/model/channel/group.rs
index 61fe67e..9a371e8 100644
--- a/src/model/channel/group.rs
+++ b/src/model/channel/group.rs
@@ -2,7 +2,11 @@ use chrono::{DateTime, FixedOffset};
 use model::prelude::*;
 
 #[cfg(feature = "model")]
-use builder::{CreateMessage, EditMessage, GetMessages};
+use builder::{
+    CreateMessage, 
+    EditMessage, 
+    GetMessages
+};
 #[cfg(feature = "model")]
 use http::{self, AttachmentType};
 #[cfg(feature = "model")]
diff --git a/src/model/channel/guild_channel.rs b/src/model/channel/guild_channel.rs
index 9b7d431..c001b5c 100644
--- a/src/model/channel/guild_channel.rs
+++ b/src/model/channel/guild_channel.rs
@@ -4,13 +4,23 @@ use model::prelude::*;
 #[cfg(all(feature = "cache", feature = "model"))]
 use CACHE;
 #[cfg(feature = "model")]
-use builder::{CreateInvite, CreateMessage, EditChannel, EditMessage, GetMessages};
+use builder::{
+    CreateInvite, 
+    CreateMessage, 
+    EditChannel, 
+    EditMessage, 
+    GetMessages
+};
 #[cfg(feature = "model")]
 use http::{self, AttachmentType};
 #[cfg(all(feature = "cache", feature = "model"))]
 use internal::prelude::*;
 #[cfg(feature = "model")]
-use std::fmt::{Display, Formatter, Result as FmtResult};
+use std::fmt::{
+    Display, 
+    Formatter, 
+    Result as FmtResult
+};
 #[cfg(feature = "model")]
 use std::mem;
 #[cfg(all(feature = "model", feature = "utils"))]
diff --git a/src/model/channel/private_channel.rs b/src/model/channel/private_channel.rs
index 7c8b1e8..dc93a7f 100644
--- a/src/model/channel/private_channel.rs
+++ b/src/model/channel/private_channel.rs
@@ -1,10 +1,18 @@
 use chrono::{DateTime, FixedOffset};
 use model::prelude::*;
-use std::fmt::{Display, Formatter, Result as FmtResult};
+use std::fmt::{
+    Display, 
+    Formatter, 
+    Result as FmtResult
+};
 use super::deserialize_single_recipient;
 
 #[cfg(feature = "model")]
-use builder::{CreateMessage, EditMessage, GetMessages};
+use builder::{
+    CreateMessage, 
+    EditMessage,
+    GetMessages
+};
 #[cfg(feature = "model")]
 use http::AttachmentType;
 #[cfg(feature = "model")]
diff --git a/src/model/channel/reaction.rs b/src/model/channel/reaction.rs
index 42c3578..fcffa20 100644
--- a/src/model/channel/reaction.rs
+++ b/src/model/channel/reaction.rs
@@ -1,9 +1,16 @@
 use model::prelude::*;
 use serde::de::{Deserialize, Error as DeError, MapAccess, Visitor};
 use serde::ser::{SerializeMap, Serialize, Serializer};
-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,
+    fmt::{
+        Display, 
+        Formatter, 
+        Result as FmtResult, 
+        Write as FmtWrite
+    },
+    str::FromStr
+};
 use internal::prelude::*;
 
 #[cfg(all(feature = "cache", feature = "model"))]
diff --git a/src/model/error.rs b/src/model/error.rs
index ea919bc..c0cd609 100644
--- a/src/model/error.rs
+++ b/src/model/error.rs
@@ -1,7 +1,13 @@
 //! Error enum definition wrapping potential model implementation errors.
 
-use std::error::Error as StdError;
-use std::fmt::{Display, Formatter, Result as FmtResult};
+use std::{
+    error::Error as StdError,
+    fmt::{
+        Display, 
+        Formatter, 
+        Result as FmtResult
+    }
+};
 use super::Permissions;
 
 /// An error returned from the [`model`] module.
diff --git a/src/model/event.rs b/src/model/event.rs
index 5f66dac..4f5e617 100644
--- a/src/model/event.rs
+++ b/src/model/event.rs
@@ -2,7 +2,11 @@
 
 use chrono::{DateTime, FixedOffset};
 use serde::de::Error as DeError;
-use serde::ser::{Serialize, SerializeSeq, Serializer};
+use serde::ser::{
+    Serialize, 
+    SerializeSeq,
+    Serializer
+};
 use serde_json;
 use std::collections::HashMap;
 use super::utils::deserialize_emojis;
diff --git a/src/model/guild/audit_log.rs b/src/model/guild/audit_log.rs
index c85bab9..5927221 100644
--- a/src/model/guild/audit_log.rs
+++ b/src/model/guild/audit_log.rs
@@ -1,10 +1,18 @@
 use internal::prelude::*;
-use serde::de::{self, Deserialize, Deserializer, MapAccess, Visitor};
+use serde::de::{
+    self, 
+    Deserialize, 
+    Deserializer, 
+    MapAccess, 
+    Visitor
+};
 use serde::ser::Serializer;
 use super::super::prelude::*;
-use std::collections::HashMap;
-use std::mem::transmute;
-use std::fmt;
+use std::{
+    collections::HashMap,
+    mem::transmute,
+    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 23a174d..2118c44 100644
--- a/src/model/guild/emoji.rs
+++ b/src/model/guild/emoji.rs
@@ -1,4 +1,9 @@
-use std::fmt::{Display, Formatter, Result as FmtResult, Write as FmtWrite};
+use std::fmt::{
+    Display, 
+    Formatter, 
+    Result as FmtResult, 
+    Write as FmtWrite
+};
 use super::super::id::{EmojiId, RoleId};
 
 #[cfg(all(feature = "cache", feature = "model"))]
diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs
index cbc6066..9be2d85 100644
--- a/src/model/guild/member.rs
+++ b/src/model/guild/member.rs
@@ -1,6 +1,10 @@
 use model::prelude::*;
 use chrono::{DateTime, FixedOffset};
-use std::fmt::{Display, Formatter, Result as FmtResult};
+use std::fmt::{
+    Display, 
+    Formatter, 
+    Result as FmtResult
+};
 use super::deserialize_sync_user;
 
 #[cfg(all(feature = "builder", feature = "cache", feature = "model"))]
diff --git a/src/model/mod.rs b/src/model/mod.rs
index 5e35e92..4416d2d 100644
--- a/src/model/mod.rs
+++ b/src/model/mod.rs
@@ -44,12 +44,18 @@ 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 std::{
+    collections::HashMap,
+    fmt::{
+        Display, 
+        Formatter, 
+        Result as FmtResult
+    },
+    sync::Arc,
+    result::Result as StdResult
+};
 
 #[cfg(feature = "utils")]
 use utils::Colour;
 
 use serde::{Deserialize, Deserializer};
-use std::result::Result as StdResult;
diff --git a/src/model/utils.rs b/src/model/utils.rs
index 981b61b..f057047 100644
--- a/src/model/utils.rs
+++ b/src/model/utils.rs
@@ -1,9 +1,11 @@
 use parking_lot::RwLock;
 use serde::de::Error as DeError;
 use serde::ser::{SerializeSeq, Serialize, Serializer};
-use std::collections::HashMap;
-use std::hash::Hash;
-use std::sync::Arc;
+use std::{
+    collections::HashMap,
+    hash::Hash,
+    sync::Arc
+};
 use super::prelude::*;
 
 #[cfg(feature = "cache")]
diff --git a/src/model/webhook.rs b/src/model/webhook.rs
index 0d6b7c9..ab07b43 100644
--- a/src/model/webhook.rs
+++ b/src/model/webhook.rs
@@ -1,7 +1,13 @@
 //! Webhook model and implementations.
 
-use super::id::{ChannelId, GuildId, WebhookId};
-use super::user::User;
+use super::{
+    id::{
+        ChannelId, 
+        GuildId, 
+        WebhookId
+    },
+    user::User
+};
 
 #[cfg(feature = "model")]
 use builder::ExecuteWebhook;