From 831a906e8e422ff2bf294e5496c3a6acef804d8e Mon Sep 17 00:00:00 2001 From: Nathan Perry Date: Mon, 13 Aug 2018 19:51:07 -0400 Subject: update for 2018 edition --- src/commands/meme.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/commands/meme.rs') diff --git a/src/commands/meme.rs b/src/commands/meme.rs index 44e29f1..3fd9db3 100644 --- a/src/commands/meme.rs +++ b/src/commands/meme.rs @@ -5,19 +5,20 @@ use serenity::framework::standard::Args; use diesel::PgConnection; use failure::Error; use std::sync::RwLock; +use lazy_static::lazy_static; use super::*; use super::playback::CtxExt; -use db::*; -use Result; +use crate::db::*; +use crate::Result; lazy_static! { static ref LAST_MEME: RwLock> = RwLock::new(None); } fn update_meme(meme: &Meme) -> Result<()> { - let mut opt = LAST_MEME.write().map_err(|_| ::failure::err_msg("unable to acquire lock"))?; + let mut opt = LAST_MEME.write().map_err(|_| crate::failure::err_msg("unable to acquire lock"))?; *opt = Some(meme.id); Ok(()) @@ -69,7 +70,7 @@ pub fn wat(_: &mut Context, msg: &Message, _: Args) -> Result<()> { match meme { Ok(ref meme) => { let metadata = Metadata::find(&conn, meme.metadata_id)?; - let author = ::TARGET_GUILD_ID.member(metadata.created_by as u64)?; + let author = crate::TARGET_GUILD_ID.member(metadata.created_by as u64)?; send(msg.channel_id, &format!("that was \"{}\" by {} ({})", -- cgit v1.3.1