Refactor imports/exports to use nested groups and better formatting

2 files changed, 23 insertions, 15 deletions

diff --git a/src/utils/message_builder.rs b/src/utils/message_builder.rs
index b034e6a..8e0878f 100644
--- a/src/utils/message_builder.rs
+++ b/src/utils/message_builder.rs
@@ -1,9 +1,13 @@
-use model::guild::Emoji;
-use model::id::{ChannelId, RoleId, UserId};
-use model::misc::Mentionable;
-use std::default::Default;
-use std::fmt::{self, Display, Write};
-use std::ops::Add;
+use model::{
+    guild::Emoji,
+    id::{ChannelId, RoleId, UserId},
+    misc::Mentionable
+};
+use std::{
+    default::Default,
+    fmt::{self, Display, Write},
+    ops::Add
+};
 
 /// The Message Builder is an ergonomic utility to easily build a message,
 /// by adding text and mentioning mentionable structs.
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index 5b98b7b..50f6579 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -5,20 +5,24 @@ mod colour;
 mod message_builder;
 mod vec_map;
 
-pub use self::colour::Colour;
-pub use self::message_builder::{Content, ContentModifier, MessageBuilder};
-pub use self::vec_map::VecMap;
+pub use self::{
+    colour::Colour,
+    message_builder::{Content, ContentModifier, MessageBuilder},
+    vec_map::VecMap
+};
 
 use base64;
 use internal::prelude::*;
 use model::id::EmojiId;
 use model::misc::EmojiIdentifier;
-use std::collections::HashMap;
-use std::ffi::OsStr;
-use std::fs::File;
-use std::hash::{BuildHasher, Hash};
-use std::io::Read;
-use std::path::Path;
+use std::{
+    collections::HashMap,
+    ffi::OsStr,
+    fs::File,
+    hash::{BuildHasher, Hash},
+    io::Read,
+    path::Path
+};
 
 #[cfg(feature = "cache")]
 use cache::Cache;