Remove 'extern crate' lines

15 files changed, 58 insertions, 62 deletions

diff --git a/src/error.rs b/src/error.rs
index 039b71d..fa4da22 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,6 +1,9 @@
 //! Errors for `frippy` crate using `failure`.
 
 use failure::Fail;
+use log::error;
+
+use frippy_derive::Error;
 
 pub fn log_error(e: &FrippyError) {
     let text = e
diff --git a/src/lib.rs b/src/lib.rs
index cc1dca2..fc539e2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -28,34 +28,6 @@
 //! Frippy uses the [log](https://docs.rs/log) crate so you can log events
 //! which might be of interest.
 
-#[cfg(feature = "mysql")]
-#[macro_use]
-extern crate diesel;
-#[cfg(feature = "mysql")]
-extern crate r2d2;
-#[cfg(feature = "mysql")]
-extern crate r2d2_diesel;
-
-#[macro_use]
-extern crate failure;
-#[macro_use]
-extern crate frippy_derive;
-#[macro_use]
-extern crate lazy_static;
-#[macro_use]
-extern crate log;
-
-extern crate antidote;
-extern crate chrono;
-extern crate circular_queue;
-extern crate humantime;
-extern crate irc;
-extern crate rand;
-extern crate regex;
-extern crate reqwest;
-extern crate serde_json;
-extern crate time;
-
 pub mod error;
 pub mod plugin;
 pub mod plugins;
@@ -65,6 +37,7 @@ use crate::plugin::*;
 
 use crate::error::*;
 use failure::ResultExt;
+use log::{debug, error, info};
 
 pub use irc::client::data::Config;
 use irc::client::ext::ClientExt;
diff --git a/src/main.rs b/src/main.rs
index 5bf921b..960cc3b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,24 +1,3 @@
-extern crate frippy;
-extern crate glob;
-extern crate irc;
-extern crate log4rs;
-extern crate time;
-
-#[cfg(feature = "mysql")]
-extern crate diesel;
-#[cfg(feature = "mysql")]
-#[macro_use]
-extern crate diesel_migrations;
-#[cfg(feature = "mysql")]
-extern crate r2d2;
-#[cfg(feature = "mysql")]
-extern crate r2d2_diesel;
-
-#[macro_use]
-extern crate failure;
-#[macro_use]
-extern crate log;
-
 use std::collections::HashMap;
 #[cfg(feature = "mysql")]
 use std::sync::Arc;
@@ -36,8 +15,9 @@ use frippy::plugins::tell::Tell;
 use frippy::plugins::unicode::Unicode;
 use frippy::plugins::url::UrlTitles;
 
-use failure::Error;
+use failure::{bail, Error};
 use frippy::Config;
+use log::{error, info};
 
 #[cfg(feature = "mysql")]
 embed_migrations!();
diff --git a/src/plugins/factoid/mod.rs b/src/plugins/factoid/mod.rs
index e50def8..eaae862 100644
--- a/src/plugins/factoid/mod.rs
+++ b/src/plugins/factoid/mod.rs
@@ -1,5 +1,3 @@
-extern crate rlua;
-
 use std::fmt;
 use std::marker::PhantomData;
 use std::str::FromStr;
@@ -7,8 +5,8 @@ use std::sync::Arc;
 use std::thread;
 use std::time::{Duration, Instant};
 
-use self::rlua::prelude::*;
-use self::rlua::HookTriggers;
+use rlua::prelude::*;
+use rlua::HookTriggers;
 use antidote::RwLock;
 use irc::client::prelude::*;
 
@@ -27,7 +25,9 @@ use crate::utils::Url;
 use self::error::*;
 use crate::error::ErrorKind as FrippyErrorKind;
 use crate::error::FrippyError;
-use failure::ResultExt;
+use failure::{format_err, ResultExt};
+
+use frippy_derive::PluginName;
 
 static LUA_SANDBOX: &'static str = include_str!("sandbox.lua");
 
@@ -388,6 +388,9 @@ impl<T: Database, C: FrippyClient> fmt::Debug for Factoid<T, C> {
 }
 
 pub mod error {
+    use failure::Fail;
+    use frippy_derive::Error;
+
     #[derive(Copy, Clone, Eq, PartialEq, Debug, Fail, Error)]
     #[error = "FactoidError"]
     pub enum ErrorKind {
diff --git a/src/plugins/factoid/utils.rs b/src/plugins/factoid/utils.rs
index f9ab8c2..ba965cc 100644
--- a/src/plugins/factoid/utils.rs
+++ b/src/plugins/factoid/utils.rs
@@ -3,9 +3,9 @@ use std::time::Duration;
 
 use serde_json::{self, Value as SerdeValue};
 
-use super::rlua::Error as LuaError;
-use super::rlua::Error::RuntimeError;
-use super::rlua::{Context, Value as LuaValue};
+use rlua::Error as LuaError;
+use rlua::Error::RuntimeError;
+use rlua::{Context, Value as LuaValue};
 
 use crate::utils::error::ErrorKind::Connection;
 use crate::utils::Url;
diff --git a/src/plugins/help.rs b/src/plugins/help.rs
index b03215b..ce20c2c 100644
--- a/src/plugins/help.rs
+++ b/src/plugins/help.rs
@@ -9,6 +9,8 @@ use crate::error::ErrorKind as FrippyErrorKind;
 use crate::error::FrippyError;
 use failure::ResultExt;
 
+use frippy_derive::PluginName;
+
 #[derive(PluginName, Default, Debug)]
 pub struct Help<C> {
     phantom: PhantomData<C>,
diff --git a/src/plugins/keepnick.rs b/src/plugins/keepnick.rs
index 5a26a95..d5b9318 100644
--- a/src/plugins/keepnick.rs
+++ b/src/plugins/keepnick.rs
@@ -8,6 +8,9 @@ use crate::FrippyClient;
 use crate::error::ErrorKind as FrippyErrorKind;
 use crate::error::FrippyError;
 use failure::ResultExt;
+use log::info;
+
+use frippy_derive::PluginName;
 
 #[derive(PluginName, Default, Debug)]
 pub struct KeepNick<C> {
diff --git a/src/plugins/quote/mod.rs b/src/plugins/quote/mod.rs
index 1eba861..e7ec77c 100644
--- a/src/plugins/quote/mod.rs
+++ b/src/plugins/quote/mod.rs
@@ -18,6 +18,8 @@ use crate::error::ErrorKind as FrippyErrorKind;
 use crate::error::FrippyError;
 use failure::ResultExt;
 
+use frippy_derive::PluginName;
+
 enum QuoteResponse {
     Public(String),
     Private(String),
@@ -261,6 +263,9 @@ impl<T: Database, C: FrippyClient> fmt::Debug for Quote<T, C> {
 }
 
 pub mod error {
+    use failure::Fail;
+    use frippy_derive::Error;
+
     #[derive(Copy, Clone, Eq, PartialEq, Debug, Fail, Error)]
     #[error = "QuoteError"]
     pub enum ErrorKind {
diff --git a/src/plugins/remind/mod.rs b/src/plugins/remind/mod.rs
index b03aebc..da6cdc6 100644
--- a/src/plugins/remind/mod.rs
+++ b/src/plugins/remind/mod.rs
@@ -20,6 +20,9 @@ use self::error::*;
 use crate::error::ErrorKind as FrippyErrorKind;
 use crate::error::FrippyError;
 use failure::ResultExt;
+use log::{debug, error};
+
+use frippy_derive::PluginName;
 
 fn get_time() -> NaiveDateTime {
     let tm = time::now().to_timespec();
@@ -275,6 +278,9 @@ impl<T: Database, C: FrippyClient> fmt::Debug for Remind<T, C> {
 }
 
 pub mod error {
+    use failure::Fail;
+    use frippy_derive::Error;
+
     #[derive(Copy, Clone, Eq, PartialEq, Debug, Fail, Error)]
     #[error = "RemindError"]
     pub enum ErrorKind {
diff --git a/src/plugins/remind/parser.rs b/src/plugins/remind/parser.rs
index b9682df..a695472 100644
--- a/src/plugins/remind/parser.rs
+++ b/src/plugins/remind/parser.rs
@@ -5,6 +5,7 @@ use time;
 
 use super::error::*;
 use failure::ResultExt;
+use log::debug;
 
 #[derive(Default, Debug)]
 pub struct CommandParser {
diff --git a/src/plugins/sed.rs b/src/plugins/sed.rs
index e8a34b5..46e035c 100644
--- a/src/plugins/sed.rs
+++ b/src/plugins/sed.rs
@@ -3,6 +3,7 @@ use std::marker::PhantomData;
 
 use antidote::RwLock;
 use circular_queue::CircularQueue;
+use lazy_static::lazy_static;
 use regex::{Captures, Regex, RegexBuilder};
 
 use irc::client::prelude::*;
@@ -15,6 +16,9 @@ use crate::error::ErrorKind as FrippyErrorKind;
 use crate::error::FrippyError;
 use failure::Fail;
 use failure::ResultExt;
+use log::debug;
+
+use frippy_derive::PluginName;
 
 lazy_static! {
     static ref RE: Regex =
@@ -175,6 +179,9 @@ impl<C: FrippyClient> Plugin for Sed<C> {
 }
 
 pub mod error {
+    use failure::Fail;
+    use frippy_derive::Error;
+
     #[derive(Copy, Clone, Eq, PartialEq, Debug, Fail, Error)]
     #[error = "SedError"]
     pub enum ErrorKind {
diff --git a/src/plugins/tell/mod.rs b/src/plugins/tell/mod.rs
index 16bf7eb..5fe4bd1 100644
--- a/src/plugins/tell/mod.rs
+++ b/src/plugins/tell/mod.rs
@@ -19,6 +19,8 @@ use failure::Fail;
 use failure::ResultExt;
 use log::{debug, trace};
 
+use frippy_derive::PluginName;
+
 pub mod database;
 use self::database::Database;
 
@@ -261,6 +263,9 @@ impl<T: Database, C: FrippyClient> fmt::Debug for Tell<T, C> {
 }
 
 pub mod error {
+    use failure::Fail;
+    use frippy_derive::Error;
+
     #[derive(Copy, Clone, Eq, PartialEq, Debug, Fail, Error)]
     #[error = "TellError"]
     pub enum ErrorKind {
diff --git a/src/plugins/unicode.rs b/src/plugins/unicode.rs
index a78422d..9c5613e 100644
--- a/src/plugins/unicode.rs
+++ b/src/plugins/unicode.rs
@@ -1,5 +1,3 @@
-extern crate unicode_names;
-
 use std::marker::PhantomData;
 
 use irc::client::prelude::*;
@@ -11,6 +9,8 @@ use crate::error::ErrorKind as FrippyErrorKind;
 use crate::error::FrippyError;
 use failure::Fail;
 
+use frippy_derive::PluginName;
+
 #[derive(PluginName, Default, Debug)]
 pub struct Unicode<C> {
     phantom: PhantomData<C>,
diff --git a/src/plugins/url.rs b/src/plugins/url.rs
index 86c77b5..3b21b9e 100644
--- a/src/plugins/url.rs
+++ b/src/plugins/url.rs
@@ -1,10 +1,9 @@
-extern crate htmlescape;
-
 use std::marker::PhantomData;
 use std::time::Duration;
 
 use irc::client::prelude::*;
 
+use lazy_static::lazy_static;
 use regex::Regex;
 
 use crate::plugin::*;
@@ -16,6 +15,9 @@ use crate::error::ErrorKind as FrippyErrorKind;
 use crate::error::FrippyError;
 use failure::Fail;
 use failure::ResultExt;
+use log::debug;
+
+use frippy_derive::PluginName;
 
 lazy_static! {
     static ref URL_RE: Regex = Regex::new(r"(^|\s)(https?://\S+)").unwrap();
@@ -206,6 +208,9 @@ impl<C: FrippyClient> Plugin for UrlTitles<C> {
 }
 
 pub mod error {
+    use failure::Fail;
+    use frippy_derive::Error;
+
     /// A URL plugin error
     #[derive(Copy, Clone, Eq, PartialEq, Debug, Fail, Error)]
     #[error = "UrlError"]
diff --git a/src/utils.rs b/src/utils.rs
index 51bd423..f953211 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -98,6 +98,9 @@ impl<'a> Url<'a> {
 }
 
 pub mod error {
+    use failure::Fail;
+    use frippy_derive::Error;
+
     #[derive(Copy, Clone, Eq, PartialEq, Debug, Fail, Error)]
     #[error = "DownloadError"]
     pub enum ErrorKind {