From 1a8a6eca29afe2178c6cf17abce9ab7e229ca26c Mon Sep 17 00:00:00 2001 From: Nathan Perry Date: Thu, 24 Jan 2019 20:03:25 -0500 Subject: improve imports further and fix compile warnings --- src/commands/mod.rs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/commands/mod.rs') 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 @@ -83,9 +85,6 @@ pub fn register_commands(f: StandardFramework) -> StandardFramework { #[cfg(feature = "diesel")] mod meme; -#[cfg(feature = "diesel")] -pub use self::meme::*; - #[cfg(feature = "diesel")] fn register_db(f: StandardFramework) -> StandardFramework { f -- cgit v1.3.1