Refactor imports/exports to use nested groups and better formatting

9 files changed, 110 insertions, 44 deletions

diff --git a/src/framework/standard/args.rs b/src/framework/standard/args.rs
index 1a819b6..2dc450c 100644
--- a/src/framework/standard/args.rs
+++ b/src/framework/standard/args.rs
@@ -1,6 +1,8 @@
-use std::str::FromStr;
-use std::error::Error as StdError;
-use std::fmt;
+use std::{
+    str::FromStr,
+    error::Error as StdError,
+    fmt
+};
 
 /// Defines how an operation on an `Args` method failed.
 #[derive(Debug)]
diff --git a/src/framework/standard/buckets.rs b/src/framework/standard/buckets.rs
index c29805f..37a2de0 100644
--- a/src/framework/standard/buckets.rs
+++ b/src/framework/standard/buckets.rs
@@ -1,8 +1,10 @@
 use chrono::Utc;
 use client::Context;
 use model::id::{ChannelId, GuildId, UserId};
-use std::collections::HashMap;
-use std::default::Default;
+use std::{
+    collections::HashMap,
+    default::Default
+};
 
 #[cfg(feature = "cache")]
 type Check = Fn(&mut Context, Option<GuildId>, ChannelId, UserId) -> bool + Send + Sync + 'static;
diff --git a/src/framework/standard/command.rs b/src/framework/standard/command.rs
index a971c1f..1dff57b 100644
--- a/src/framework/standard/command.rs
+++ b/src/framework/standard/command.rs
@@ -1,10 +1,14 @@
 use client::Context;
-use model::channel::Message;
-use model::Permissions;
-use std::collections::HashMap;
-use std::fmt;
-use std::fmt::{Debug, Formatter};
-use std::sync::Arc;
+use model::{
+    channel::Message,
+    Permissions
+};
+use std::{
+    collections::HashMap,
+    fmt,
+    fmt::{Debug, Formatter},
+    sync::Arc
+};
 use utils::Colour;
 use super::{Args, Configuration, HelpBehaviour};
 
diff --git a/src/framework/standard/configuration.rs b/src/framework/standard/configuration.rs
index bcb0119..2b7584d 100644
--- a/src/framework/standard/configuration.rs
+++ b/src/framework/standard/configuration.rs
@@ -1,9 +1,13 @@
 use client::Context;
 use http;
-use model::channel::Message;
-use model::id::{GuildId, UserId};
-use std::collections::HashSet;
-use std::default::Default;
+use model::{
+    channel::Message,
+    id::{GuildId, UserId}
+};
+use std::{
+    collections::HashSet,
+    default::Default
+};
 use super::command::PrefixCheck;
 
 /// The configuration to use for a [`Framework`] associated with a [`Client`]
diff --git a/src/framework/standard/create_command.rs b/src/framework/standard/create_command.rs
index 8fbb975..bc85eb6 100644
--- a/src/framework/standard/create_command.rs
+++ b/src/framework/standard/create_command.rs
@@ -1,8 +1,16 @@
-pub use super::{Args, Command, CommandGroup, CommandOptions, CommandError};
+pub use super::{
+    Args, 
+    Command, 
+    CommandGroup, 
+    CommandOptions, 
+    CommandError
+};
 
 use client::Context;
-use model::channel::Message;
-use model::Permissions;
+use model::{
+    channel::Message,
+    Permissions
+};
 use std::sync::Arc;
 
 pub enum FnOrCommand {
diff --git a/src/framework/standard/create_group.rs b/src/framework/standard/create_group.rs
index c33f67a..e31e4eb 100644
--- a/src/framework/standard/create_group.rs
+++ b/src/framework/standard/create_group.rs
@@ -1,8 +1,15 @@
-pub use super::command::{Command, CommandGroup, CommandOptions, Error as CommandError};
+pub use super::command::{
+    Command, 
+    CommandGroup, 
+    CommandOptions, 
+    Error as CommandError
+};
 pub(crate) use super::command::CommandOrAlias;
-pub use super::create_help_command::{CreateHelpCommand};
-pub use super::create_command::{CreateCommand, FnOrCommand};
-pub use super::Args;
+pub use super::{
+    create_help_command::CreateHelpCommand,
+    create_command::{CreateCommand, FnOrCommand},
+    Args
+};
 
 use client::Context;
 use model::channel::Message;
diff --git a/src/framework/standard/create_help_command.rs b/src/framework/standard/create_help_command.rs
index 06f9dda..3796139 100644
--- a/src/framework/standard/create_help_command.rs
+++ b/src/framework/standard/create_help_command.rs
@@ -1,9 +1,21 @@
-use super::command::{Help, HelpOptions, HelpFunction};
-pub use super::{Args, CommandGroup, CommandOptions, CommandError, HelpBehaviour};
+use super::command::{
+    Help, 
+    HelpOptions, 
+    HelpFunction
+};
+pub use super::{
+    Args, 
+    CommandGroup, 
+    CommandOptions, 
+    CommandError, 
+    HelpBehaviour
+};
 
 use utils::Colour;
-use std::fmt::Write;
-use std::sync::Arc;
+use std::{
+    fmt::Write,
+    sync::Arc
+};
 
 pub struct CreateHelpCommand(pub HelpOptions, pub HelpFunction);
 
diff --git a/src/framework/standard/help_commands.rs b/src/framework/standard/help_commands.rs
index 6a1ce82..3acc37b 100644
--- a/src/framework/standard/help_commands.rs
+++ b/src/framework/standard/help_commands.rs
@@ -26,14 +26,26 @@
 use client::Context;
 #[cfg(feature = "cache")]
 use framework::standard::{has_correct_roles, has_correct_permissions};
-use model::channel::Message;
-use model::id::ChannelId;
-use std::collections::HashMap;
-use std::hash::BuildHasher;
-use std::sync::Arc;
-use std::fmt::Write;
-use super::command::{InternalCommand};
-use super::{Args, CommandGroup, CommandOrAlias, HelpOptions, CommandOptions, CommandError, HelpBehaviour};
+use model::{
+    channel::Message,
+    id::ChannelId
+};
+use std::{
+    collections::HashMap,
+    hash::BuildHasher,
+    sync::Arc,
+    fmt::Write
+};
+use super::command::InternalCommand;
+use super::{
+    Args, 
+    CommandGroup, 
+    CommandOrAlias, 
+    HelpOptions, 
+    CommandOptions, 
+    CommandError, 
+    HelpBehaviour
+};
 use utils::Colour;
 
 fn error_embed(channel_id: &ChannelId, input: &str, colour: Colour) {
diff --git a/src/framework/standard/mod.rs b/src/framework/standard/mod.rs
index 8db7a7d..fdb9ca4 100644
--- a/src/framework/standard/mod.rs
+++ b/src/framework/standard/mod.rs
@@ -9,10 +9,21 @@ mod create_group;
 mod buckets;
 mod args;
 
-pub use self::args::{Args, Iter, Error as ArgError};
+pub use self::args::{
+    Args, 
+    Iter, 
+    Error as ArgError
+};
 pub(crate) use self::buckets::{Bucket, Ratelimit};
-pub(crate) use self::command::{Help};
-pub use self::command::{HelpFunction, HelpOptions, Command, CommandGroup, CommandOptions, Error as CommandError};
+pub(crate) use self::command::Help;
+pub use self::command::{
+    HelpFunction, 
+    HelpOptions, 
+    Command, 
+    CommandGroup, 
+    CommandOptions, 
+    Error as CommandError
+};
 pub use self::command::CommandOrAlias;
 pub use self::configuration::Configuration;
 pub use self::create_help_command::CreateHelpCommand;
@@ -21,14 +32,18 @@ pub use self::create_group::CreateGroup;
 
 use client::Context;
 use internal::RwLockExt;
-use model::channel::Message;
-use model::guild::{Guild, Member};
-use model::id::{ChannelId, GuildId, UserId};
-use model::Permissions;
+use model::{
+    channel::Message,
+    guild::{Guild, Member},
+    id::{ChannelId, GuildId, UserId},
+    Permissions
+};
 use self::command::{AfterHook, BeforeHook, UnrecognisedCommandHook};
-use std::collections::HashMap;
-use std::default::Default;
-use std::sync::Arc;
+use std::{
+    collections::HashMap,
+    default::Default,
+    sync::Arc
+};
 use super::Framework;
 use threadpool::ThreadPool;