From 6ad374d089d917cba53a76a40f9fb9bc5793ceb2 Mon Sep 17 00:00:00 2001
From: Nathan Perry <avaglir@gmail.com>
Date: Thu, 24 Jan 2019 21:48:39 -0500
Subject: fix last of import inconsistencies

---
 src/commands/mod.rs            | 13 ++-----------
 src/commands/playback/mod.rs   | 14 +++++++++++---
 src/commands/playback/types.rs | 23 ++++++++++++++++++-----
 3 files changed, 31 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/commands/mod.rs b/src/commands/mod.rs
index f2e577b..b73faef 100644
--- a/src/commands/mod.rs
+++ b/src/commands/mod.rs
@@ -1,18 +1,9 @@
-use std::{
-    thread,
-    time::Duration,
-};
-
 use serenity::{
     framework::StandardFramework,
-    model::{
-        channel::Message,
-        id::ChannelId,
-    },
-    prelude::*,
+    model::id::ChannelId,
 };
 
-use crate::{must_env_lookup, Result, TARGET_GUILD_ID};
+use crate::Result;
 
 #[cfg(feature = "diesel")]
 pub use self::meme::*;
diff --git a/src/commands/playback/mod.rs b/src/commands/playback/mod.rs
index 83732f2..051fabb 100644
--- a/src/commands/playback/mod.rs
+++ b/src/commands/playback/mod.rs
@@ -1,11 +1,19 @@
 use either::{Left, Right};
 use serenity::{
     framework::standard::Args,
-    model::id::ChannelId,
-    voice::{LockedAudio, ytdl},
+    model::{
+        channel::Message,
+        id::ChannelId,
+    },
+    prelude::*,
 };
 
-use super::*;
+use crate::{
+    commands::send,
+    must_env_lookup,
+    Result,
+    TARGET_GUILD_ID,
+};
 
 pub use self::types::*;
 
diff --git a/src/commands/playback/types.rs b/src/commands/playback/types.rs
index 9c1a878..63479fd 100644
--- a/src/commands/playback/types.rs
+++ b/src/commands/playback/types.rs
@@ -1,14 +1,27 @@
 use std::{
-    sync::{Arc, RwLock},
     collections::VecDeque,
+    sync::{Arc, RwLock},
+    thread,
+    time::Duration,
 };
 
-use serenity::client::bridge::voice::ClientVoiceManager;
-use typemap::Key;
-
 use either::{Either, Left, Right};
+use serenity::{
+    client::bridge::voice::ClientVoiceManager,
+    model::id::ChannelId,
+    prelude::*,
+    voice::{LockedAudio, ytdl},
+};
+use typemap::Key;
 
-use super::*;
+use crate::{
+    commands::{
+        send,
+        sound::DEFAULT_VOLUME
+    },
+    must_env_lookup,
+    TARGET_GUILD_ID,
+};
 
 pub struct VoiceManager;
 
-- 
cgit v1.3.1