update for 2018 edition

5 files changed, 11 insertions, 25 deletions

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<Option<i32>> = 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 {} ({})",
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
index 4d7b4ae..bf55b90 100644
--- a/src/commands/mod.rs
+++ b/src/commands/mod.rs
@@ -1,4 +1,4 @@
-use {must_env_lookup, Result, TARGET_GUILD_ID};
+use crate::{must_env_lookup, Result, TARGET_GUILD_ID};
 use serenity::framework::StandardFramework;
 use serenity::model::channel::Message;
 use serenity::model::id::ChannelId;
diff --git a/src/commands/roll.rs b/src/commands/roll.rs
index 8ceb285..55b5429 100644
--- a/src/commands/roll.rs
+++ b/src/commands/roll.rs
@@ -4,7 +4,7 @@ use serenity::model::channel::Message;
 use regex::Regex;
 use rand::prelude::*;
 
-use Result;
+use crate::Result;
 
 use super::send;
 
diff --git a/src/db/models.rs b/src/db/models.rs
index 0708e7c..659a38a 100644
--- a/src/db/models.rs
+++ b/src/db/models.rs
@@ -2,7 +2,7 @@ use chrono::naive::NaiveDateTime;
 use diesel::prelude::*;

 

 use super::schema::*;

-use ::{Result, Error};

+use crate::{Result, Error};

 

 #[derive(Queryable, Identifiable, PartialEq, Debug)]

 #[table_name="memes"]

diff --git a/src/main.rs b/src/main.rs
index 7bc37ec..baf1e06 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,23 +1,9 @@
 #![feature(transpose_result)]
 
-extern crate chrono;
-extern crate ctrlc;
-extern crate dotenv;
-#[macro_use] extern crate dotenv_codegen;
-#[macro_use] extern crate failure;
-extern crate fern;
 #[macro_use] extern crate lazy_static;
 #[macro_use] extern crate log;
-extern crate serenity;
-extern crate typemap;
-extern crate url;
-extern crate rand;
-extern crate either;
-extern crate reqwest;
-extern crate sha1;
-extern crate mime_guess;
-extern crate regex;
-extern crate clap;
+#[macro_use] extern crate dotenv_codegen;
+#[macro_use] extern crate failure;
 
 use self::commands::register_commands;
 use dotenv::dotenv;
@@ -26,8 +12,7 @@ use serenity::framework::StandardFramework;
 use serenity::model::gateway::Ready;
 use serenity::model::id::{GuildId, UserId};
 use serenity::prelude::*;
-use std::env;
-use std::thread;
+use std::{env, thread};
 use std::time::{Duration, Instant};
 
 use failure::Error;