Refactor imports/exports to use nested groups and better formatting

11 files changed, 81 insertions, 35 deletions

diff --git a/src/client/bridge/gateway/mod.rs b/src/client/bridge/gateway/mod.rs
index 3cc6dca..16f0f07 100644
--- a/src/client/bridge/gateway/mod.rs
+++ b/src/client/bridge/gateway/mod.rs
@@ -63,9 +63,15 @@ pub use self::shard_queuer::ShardQueuer;
 pub use self::shard_runner::{ShardRunner, ShardRunnerOptions};
 pub use self::shard_runner_message::ShardRunnerMessage;
 
-use std::fmt::{Display, Formatter, Result as FmtResult};
-use std::sync::mpsc::Sender;
-use std::time::Duration as StdDuration;
+use std::{
+    fmt::{
+        Display, 
+        Formatter, 
+        Result as FmtResult
+    },
+    sync::mpsc::Sender,
+    time::Duration as StdDuration
+};
 use ::gateway::{ConnectionStage, InterMessage};
 
 /// A message either for a [`ShardManager`] or a [`ShardRunner`].
diff --git a/src/client/bridge/gateway/shard_manager.rs b/src/client/bridge/gateway/shard_manager.rs
index b62ff00..a6cea31 100644
--- a/src/client/bridge/gateway/shard_manager.rs
+++ b/src/client/bridge/gateway/shard_manager.rs
@@ -1,10 +1,14 @@
 use gateway::InterMessage;
 use internal::prelude::*;
 use parking_lot::Mutex;
-use std::collections::{HashMap, VecDeque};
-use std::sync::mpsc::{self, Sender};
-use std::sync::Arc;
-use std::thread;
+use std::{
+    collections::{HashMap, VecDeque},
+    sync::{
+        mpsc::{self, Sender},
+        Arc
+    },
+    thread
+};
 use super::super::super::EventHandler;
 use super::{
     ShardClientMessage,
diff --git a/src/client/bridge/gateway/shard_manager_monitor.rs b/src/client/bridge/gateway/shard_manager_monitor.rs
index 9f9c04d..16cc001 100644
--- a/src/client/bridge/gateway/shard_manager_monitor.rs
+++ b/src/client/bridge/gateway/shard_manager_monitor.rs
@@ -1,6 +1,8 @@
 use parking_lot::Mutex;
-use std::sync::mpsc::Receiver;
-use std::sync::Arc;
+use std::sync::{
+    mpsc::Receiver,
+    Arc
+};
 use super::{ShardManager, ShardManagerMessage};
 
 /// The shard manager monitor does what it says on the tin -- it monitors the
diff --git a/src/client/bridge/gateway/shard_queuer.rs b/src/client/bridge/gateway/shard_queuer.rs
index afcd4c7..edcb6ab 100644
--- a/src/client/bridge/gateway/shard_queuer.rs
+++ b/src/client/bridge/gateway/shard_queuer.rs
@@ -1,11 +1,18 @@
 use gateway::Shard;
 use internal::prelude::*;
 use parking_lot::Mutex;
-use std::collections::{HashMap, VecDeque};
-use std::sync::mpsc::{Receiver, RecvTimeoutError, Sender};
-use std::sync::Arc;
-use std::thread;
-use std::time::{Duration, Instant};
+use std::{
+    collections::{HashMap, VecDeque},
+    sync::{
+        mpsc::{
+            Receiver, 
+            RecvTimeoutError, 
+            Sender},
+        Arc
+    },
+    thread,
+    time::{Duration, Instant}
+};
 use super::super::super::EventHandler;
 use super::{
     ShardId,
diff --git a/src/client/bridge/gateway/shard_runner.rs b/src/client/bridge/gateway/shard_runner.rs
index 466ce63..4f560e9 100644
--- a/src/client/bridge/gateway/shard_runner.rs
+++ b/src/client/bridge/gateway/shard_runner.rs
@@ -4,16 +4,25 @@ use internal::ws_impl::{ReceiverExt, SenderExt};
 use model::event::{Event, GatewayEvent};
 use parking_lot::Mutex;
 use serde::Deserialize;
-use std::sync::mpsc::{self, Receiver, Sender, TryRecvError};
-use std::sync::Arc;
+use std::sync::{
+    mpsc::{
+        self, 
+        Receiver, 
+        Sender, 
+        TryRecvError
+    },
+    Arc
+};
 use super::super::super::dispatch::{DispatchEvent, dispatch};
 use super::super::super::EventHandler;
 use super::event::{ClientEvent, ShardStageUpdateEvent};
 use super::{ShardClientMessage, ShardId, ShardManagerMessage, ShardRunnerMessage};
 use threadpool::ThreadPool;
 use typemap::ShareMap;
-use websocket::message::{CloseData, OwnedMessage};
-use websocket::WebSocketError;
+use websocket::{
+    message::{CloseData, OwnedMessage},
+    WebSocketError
+};
 
 #[cfg(feature = "framework")]
 use framework::Framework;
diff --git a/src/client/bridge/gateway/shard_runner_message.rs b/src/client/bridge/gateway/shard_runner_message.rs
index d4018b4..29024c9 100644
--- a/src/client/bridge/gateway/shard_runner_message.rs
+++ b/src/client/bridge/gateway/shard_runner_message.rs
@@ -1,6 +1,8 @@
-use model::gateway::Game;
-use model::user::OnlineStatus;
-use model::id::GuildId;
+use model::{
+    gateway::Game,
+    user::OnlineStatus,
+    id::GuildId
+};
 use websocket::message::OwnedMessage;
 
 /// A message to send from a shard over a WebSocket.
diff --git a/src/client/context.rs b/src/client/context.rs
index dcb1d48..5625cd0 100644
--- a/src/client/context.rs
+++ b/src/client/context.rs
@@ -2,8 +2,10 @@ use client::bridge::gateway::ShardMessenger;
 use gateway::InterMessage;
 use model::prelude::*;
 use parking_lot::Mutex;
-use std::sync::mpsc::Sender;
-use std::sync::Arc;
+use std::sync::{
+    mpsc::Sender,
+    Arc
+};
 use typemap::ShareMap;
 
 #[cfg(feature = "builder")]
diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs
index 8a09c08..9413701 100644
--- a/src/client/dispatch.rs
+++ b/src/client/dispatch.rs
@@ -1,11 +1,15 @@
 use gateway::InterMessage;
-use model::event::Event;
-use model::channel::{Channel, Message};
+use model::{
+    event::Event,
+    channel::{Channel, Message}
+};
 use std::sync::Arc;
 use parking_lot::Mutex;
-use super::bridge::gateway::event::ClientEvent;
-use super::event_handler::EventHandler;
-use super::Context;
+use super::{
+    bridge::gateway::event::ClientEvent,
+    event_handler::EventHandler,
+    Context
+};
 use std::sync::mpsc::Sender;
 use threadpool::ThreadPool;
 use typemap::ShareMap;
diff --git a/src/client/error.rs b/src/client/error.rs
index 8790a17..e1f9eb2 100644
--- a/src/client/error.rs
+++ b/src/client/error.rs
@@ -1,5 +1,11 @@
-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
+    }
+};
 
 /// An error returned from the [`Client`].
 ///
diff --git a/src/client/event_handler.rs b/src/client/event_handler.rs
index 65e9d51..91e0314 100644
--- a/src/client/event_handler.rs
+++ b/src/client/event_handler.rs
@@ -1,8 +1,10 @@
 use model::prelude::*;
 use parking_lot::RwLock;
 use serde_json::Value;
-use std::collections::HashMap;
-use std::sync::Arc;
+use std::{
+    collections::HashMap,
+    sync::Arc
+};
 use super::context::Context;
 use ::client::bridge::gateway::event::*;
 
diff --git a/src/client/mod.rs b/src/client/mod.rs
index 9dfaa10..b1d0f4e 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -26,9 +26,11 @@ mod dispatch;
 mod error;
 mod event_handler;
 
-pub use self::context::Context;
-pub use self::error::Error as ClientError;
-pub use self::event_handler::EventHandler;
+pub use self::{
+    context::Context,
+    error::Error as ClientError,
+    event_handler::EventHandler
+};
 
 // Note: the following re-exports are here for backwards compatibility
 pub use gateway;