improve imports further and fix compile warnings

1 files changed, 7 insertions, 8 deletions

diff --git a/src/commands/mod.rs b/src/commands/mod.rs
index db304e3..f2e577b 100644
--- a/src/commands/mod.rs
+++ b/src/commands/mod.rs
@@ -4,23 +4,25 @@ use std::{
 };
 
 use serenity::{
-    prelude::*,
     framework::StandardFramework,
     model::{
         channel::Message,
-        id::MessageId,
+        id::ChannelId,
     },
+    prelude::*,
 };
 
 use crate::{must_env_lookup, Result, TARGET_GUILD_ID};
 
+#[cfg(feature = "diesel")]
+pub use self::meme::*;
+pub use self::playback::*;
+pub use self::sound::*;
+
 mod playback;
 mod sound;
 mod roll;
 
-pub use self::sound::*;
-pub use self::playback::*;
-
 pub fn register_commands(f: StandardFramework) -> StandardFramework {
     let f: StandardFramework = register_db(f);
     f
@@ -84,9 +86,6 @@ pub fn register_commands(f: StandardFramework) -> StandardFramework {
 mod meme;
 
 #[cfg(feature = "diesel")]
-pub use self::meme::*;
-
-#[cfg(feature = "diesel")]
 fn register_db(f: StandardFramework) -> StandardFramework {
     f
         .command("meme", |c| c