Refactor imports/exports to use nested groups and better formatting

5 files changed, 43 insertions, 9 deletions

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"))]