Refactor imports/exports to use nested groups and better formatting

8 files changed, 121 insertions, 42 deletions

diff --git a/src/voice/audio.rs b/src/voice/audio.rs
index cb60f57..2aebb83 100644
--- a/src/voice/audio.rs
+++ b/src/voice/audio.rs
@@ -1,6 +1,8 @@
 use parking_lot::Mutex;
-use std::sync::Arc;
-use std::time::Duration;
+use std::{
+    sync::Arc,
+    time::Duration
+};
 
 pub const HEADER_LEN: usize = 12;
 pub const SAMPLE_RATE: u32 = 48_000;
diff --git a/src/voice/connection.rs b/src/voice/connection.rs
index d447d5c..5c170c6 100644
--- a/src/voice/connection.rs
+++ b/src/voice/connection.rs
@@ -1,10 +1,20 @@
-use byteorder::{BigEndian, ByteOrder, LittleEndian, ReadBytesExt, WriteBytesExt};
+use byteorder::{
+    BigEndian, 
+    ByteOrder, 
+    LittleEndian, 
+    ReadBytesExt, 
+    WriteBytesExt
+};
 use constants::VOICE_GATEWAY_VERSION;
 use internal::prelude::*;
-use internal::ws_impl::{ReceiverExt, SenderExt};
-use internal::Timer;
-use model::event::VoiceEvent;
-use model::id::UserId;
+use internal::{
+    ws_impl::{ReceiverExt, SenderExt},
+    Timer
+};
+use model::{
+    event::VoiceEvent,
+    id::UserId
+};
 use opus::{
     packet as opus_packet,
     Application as CodingMode,
@@ -16,20 +26,40 @@ use opus::{
 use parking_lot::Mutex;
 use serde::Deserialize;
 use sodiumoxide::crypto::secretbox::{self, Key, Nonce};
-use std::collections::HashMap;
-use std::io::Write;
-use std::net::{SocketAddr, ToSocketAddrs, UdpSocket};
-use std::sync::mpsc::{self, Receiver as MpscReceiver, Sender as MpscSender};
-use std::sync::Arc;
-use std::thread::{self, Builder as ThreadBuilder, JoinHandle};
-use std::time::Duration;
+use std::{
+    collections::HashMap,
+    io::Write,
+    net::{SocketAddr, ToSocketAddrs, UdpSocket},
+    sync::{
+        mpsc::{
+            self, 
+            Receiver as MpscReceiver, 
+            Sender as MpscSender
+        },
+        Arc,
+    },
+    thread::{
+        self, 
+        Builder as ThreadBuilder, 
+        JoinHandle
+    },
+    time::Duration
+};
 use super::audio::{AudioReceiver, AudioType, HEADER_LEN, SAMPLE_RATE, LockedAudio};
 use super::connection_info::ConnectionInfo;
 use super::{payload, VoiceError, CRYPTO_MODE};
-use websocket::client::Url as WebsocketUrl;
-use websocket::sync::client::ClientBuilder;
-use websocket::sync::stream::{AsTcpStream, TcpStream, TlsStream};
-use websocket::sync::Client as WsClient;
+use websocket::{
+    client::Url as WebsocketUrl,
+    sync::{
+        client::ClientBuilder,
+        stream::{
+            AsTcpStream, 
+            TcpStream, 
+            TlsStream
+        },
+    },
+    sync::Client as WsClient
+};
 
 type Client = WsClient<TlsStream<TcpStream>>;
 
diff --git a/src/voice/error.rs b/src/voice/error.rs
index b3a8194..3dd3127 100644
--- a/src/voice/error.rs
+++ b/src/voice/error.rs
@@ -1,6 +1,8 @@
 use serde_json::{Error as JsonError, Value};
-use std::io::Error as IoError;
-use std::process::Output;
+use std::{
+    io::Error as IoError,
+    process::Output
+};
 
 /// An error returned from the voice module.
 // Errors which are not visible to the end user are hidden.
diff --git a/src/voice/handler.rs b/src/voice/handler.rs
index 2c9cf48..070b0c1 100644
--- a/src/voice/handler.rs
+++ b/src/voice/handler.rs
@@ -1,10 +1,18 @@
 use constants::VoiceOpCode;
 use gateway::InterMessage;
-use model::id::{ChannelId, GuildId, UserId};
-use model::voice::VoiceState;
+use model::{
+    id::{
+        ChannelId, 
+        GuildId, 
+        UserId
+    },
+    voice::VoiceState
+};
 use parking_lot::Mutex;
-use std::sync::Arc;
-use std::sync::mpsc::{self, Sender as MpscSender};
+use std::sync::{
+    mpsc::{self, Sender as MpscSender},
+    Arc
+};
 use super::connection_info::ConnectionInfo;
 use super::{Audio, AudioReceiver, AudioSource, Status as VoiceStatus, threading, LockedAudio};
 
diff --git a/src/voice/manager.rs b/src/voice/manager.rs
index 213a563..c3e3ba2 100644
--- a/src/voice/manager.rs
+++ b/src/voice/manager.rs
@@ -1,7 +1,9 @@
 use gateway::InterMessage;
 use model::id::{ChannelId, GuildId, UserId};
-use std::collections::HashMap;
-use std::sync::mpsc::Sender as MpscSender;
+use std::{
+    collections::HashMap,
+    sync::mpsc::Sender as MpscSender
+};
 use super::Handler;
 
 /// A manager is a struct responsible for managing [`Handler`]s which belong to
diff --git a/src/voice/mod.rs b/src/voice/mod.rs
index cae84a7..283ab36 100644
--- a/src/voice/mod.rs
+++ b/src/voice/mod.rs
@@ -11,12 +11,26 @@ mod payload;
 mod streamer;
 mod threading;
 
-pub use self::audio::{Audio, AudioReceiver, AudioSource, AudioType, LockedAudio};
-pub use self::dca::DcaMetadata;
-pub use self::error::{DcaError, VoiceError};
-pub use self::handler::Handler;
-pub use self::manager::Manager;
-pub use self::streamer::{dca, ffmpeg, opus, pcm, ytdl};
+pub use self::{
+    audio::{
+        Audio, 
+        AudioReceiver, 
+        AudioSource, 
+        AudioType, 
+        LockedAudio
+    },
+    dca::DcaMetadata,
+    error::{DcaError, VoiceError},
+    handler::Handler,
+    manager::Manager,
+    streamer::{
+        dca, 
+        ffmpeg, 
+        opus, 
+        pcm,
+        ytdl
+    }
+};
 
 use self::connection_info::ConnectionInfo;
 
diff --git a/src/voice/streamer.rs b/src/voice/streamer.rs
index 3265fb6..0f0e9ef 100644
--- a/src/voice/streamer.rs
+++ b/src/voice/streamer.rs
@@ -1,12 +1,29 @@
 use byteorder::{LittleEndian, ReadBytesExt};
 use internal::prelude::*;
 use serde_json;
-use std::ffi::OsStr;
-use std::fs::File;
-use std::io::{BufReader, ErrorKind as IoErrorKind, Read, Result as IoResult};
-use std::process::{Child, Command, Stdio};
-use std::result::Result as StdResult;
-use super::{AudioSource, AudioType, DcaError, DcaMetadata, VoiceError};
+use std::{
+    ffi::OsStr,
+    fs::File,
+    io::{
+        BufReader, 
+        ErrorKind as IoErrorKind, 
+        Read, 
+        Result as IoResult
+    },
+    process::{
+        Child, 
+        Command, 
+        Stdio
+    },
+    result::Result as StdResult
+};
+use super::{
+    AudioSource, 
+    AudioType, 
+    DcaError, 
+    DcaMetadata, 
+    VoiceError
+};
 
 struct ChildContainer(Child);
 
diff --git a/src/voice/threading.rs b/src/voice/threading.rs
index 5731e86..1e826a4 100644
--- a/src/voice/threading.rs
+++ b/src/voice/threading.rs
@@ -1,9 +1,13 @@
 use internal::Timer;
 use model::id::GuildId;
-use std::sync::mpsc::{Receiver as MpscReceiver, TryRecvError};
-use std::thread::Builder as ThreadBuilder;
-use super::connection::Connection;
-use super::Status;
+use std::{
+    sync::mpsc::{Receiver as MpscReceiver, TryRecvError},
+    thread::Builder as ThreadBuilder
+};
+use super::{
+    connection::Connection,
+    Status
+};
 
 pub(crate) fn start(guild_id: GuildId, rx: MpscReceiver<Status>) {
     let name = format!("Serenity Voice (G{})", guild_id);