5 files changed, 37 insertions, 17 deletions
diff --git a/src/commands/meme.rs b/src/commands/meme.rs
index 3fd9db3..de64ad5 100644
--- a/src/commands/meme.rs
+++ b/src/commands/meme.rs
@@ -1,10 +1,14 @@
+use std::sync::RwLock;
+
+use serenity::{
+    http::AttachmentType,
+    builder::CreateMessage,
+    framework::standard::Args,
+};
+
 use rand::{thread_rng, Rng};
-use serenity::http::AttachmentType;
-use serenity::builder::CreateMessage;
-use serenity::framework::standard::Args;
 use diesel::PgConnection;
 use failure::Error;
-use std::sync::RwLock;
 use lazy_static::lazy_static;
 
 use super::*;
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
index bf55b90..db304e3 100644
--- a/src/commands/mod.rs
+++ b/src/commands/mod.rs
@@ -1,10 +1,18 @@
+use std::{
+    thread,
+    time::Duration,
+};
+
+use serenity::{
+    prelude::*,
+    framework::StandardFramework,
+    model::{
+        channel::Message,
+        id::MessageId,
+    },
+};
+
 use crate::{must_env_lookup, Result, TARGET_GUILD_ID};
-use serenity::framework::StandardFramework;
-use serenity::model::channel::Message;
-use serenity::model::id::ChannelId;
-use serenity::prelude::*;
-use std::thread;
-use std::time::Duration;
 
 mod playback;
 mod sound;
diff --git a/src/commands/playback/mod.rs b/src/commands/playback/mod.rs
index bbcbd74..efb2553 100644
--- a/src/commands/playback/mod.rs
+++ b/src/commands/playback/mod.rs
@@ -1,9 +1,12 @@
 use either::{Left, Right};
-use serenity::voice::{LockedAudio, ytdl};
+use serenity::{
+    voice::{LockedAudio, ytdl},
+    model::id::ChannelId,
+    framework::standard::Args,
+};
 
 use super::*;
 pub use self::types::*;
-use serenity::framework::standard::Args;
 
 mod types;
 
diff --git a/src/commands/playback/types.rs b/src/commands/playback/types.rs
index 2035bd9..9c1a878 100644
--- a/src/commands/playback/types.rs
+++ b/src/commands/playback/types.rs
@@ -1,7 +1,10 @@
+use std::{
+    sync::{Arc, RwLock},
+    collections::VecDeque,
+};
+
 use serenity::client::bridge::voice::ClientVoiceManager;
 use typemap::Key;
-use std::sync::{Arc, RwLock};
-use std::collections::VecDeque;
 
 use either::{Either, Left, Right};
 
diff --git a/src/commands/roll.rs b/src/commands/roll.rs
index 55b5429..217b3a4 100644
--- a/src/commands/roll.rs
+++ b/src/commands/roll.rs
@@ -1,6 +1,8 @@
-use serenity::prelude::*;
-use serenity::framework::standard::Args;
-use serenity::model::channel::Message;
+use serenity::{
+    prelude::*,
+    framework::standard::Args,
+    model::channel::Message,
+};
 use regex::Regex;
 use rand::prelude::*;