Upgrade rust edition to 2018

12 files changed, 44 insertions, 44 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 50e6688..cc1dca2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -61,9 +61,9 @@ pub mod plugin;
 pub mod plugins;
 pub mod utils;
 
-use plugin::*;
+use crate::plugin::*;
 
-use error::*;
+use crate::error::*;
 use failure::ResultExt;
 
 pub use irc::client::data::Config;
@@ -230,7 +230,7 @@ where
 
 #[derive(Clone, Debug)]
 struct ThreadedPlugins<C: FrippyClient> {
-    plugins: HashMap<String, Arc<Plugin<Client = C>>>,
+    plugins: HashMap<String, Arc<dyn Plugin<Client = C>>>,
 }
 
 impl<C: FrippyClient + 'static> ThreadedPlugins<C> {
diff --git a/src/plugin.rs b/src/plugin.rs
index 65bfe1f..a6315d9 100644
--- a/src/plugin.rs
+++ b/src/plugin.rs
@@ -1,7 +1,7 @@
 //! Definitions required for every `Plugin`
 use std::fmt;
 
-use error::FrippyError;
+use crate::error::FrippyError;
 use irc::client::prelude::*;
 
 /// Describes if a [`Plugin`](trait.Plugin.html) is done working on a
diff --git a/src/plugins/factoid/mod.rs b/src/plugins/factoid/mod.rs
index 08b96ec..e50def8 100644
--- a/src/plugins/factoid/mod.rs
+++ b/src/plugins/factoid/mod.rs
@@ -15,18 +15,18 @@ use irc::client::prelude::*;
 use chrono::NaiveDateTime;
 use time;
 
-use plugin::*;
-use FrippyClient;
+use crate::plugin::*;
+use crate::FrippyClient;
 pub mod database;
 use self::database::Database;
 
 mod utils;
 use self::utils::*;
-use utils::Url;
+use crate::utils::Url;
 
 use self::error::*;
-use error::ErrorKind as FrippyErrorKind;
-use error::FrippyError;
+use crate::error::ErrorKind as FrippyErrorKind;
+use crate::error::FrippyError;
 use failure::ResultExt;
 
 static LUA_SANDBOX: &'static str = include_str!("sandbox.lua");
diff --git a/src/plugins/factoid/utils.rs b/src/plugins/factoid/utils.rs
index b764f03..f9ab8c2 100644
--- a/src/plugins/factoid/utils.rs
+++ b/src/plugins/factoid/utils.rs
@@ -7,8 +7,8 @@ use super::rlua::Error as LuaError;
 use super::rlua::Error::RuntimeError;
 use super::rlua::{Context, Value as LuaValue};
 
-use utils::error::ErrorKind::Connection;
-use utils::Url;
+use crate::utils::error::ErrorKind::Connection;
+use crate::utils::Url;
 
 use failure::Fail;
 
diff --git a/src/plugins/help.rs b/src/plugins/help.rs
index d54008a..b03215b 100644
--- a/src/plugins/help.rs
+++ b/src/plugins/help.rs
@@ -2,11 +2,11 @@ use std::marker::PhantomData;
 
 use irc::client::prelude::*;
 
-use plugin::*;
-use FrippyClient;
+use crate::plugin::*;
+use crate::FrippyClient;
 
-use error::ErrorKind as FrippyErrorKind;
-use error::FrippyError;
+use crate::error::ErrorKind as FrippyErrorKind;
+use crate::error::FrippyError;
 use failure::ResultExt;
 
 #[derive(PluginName, Default, Debug)]
diff --git a/src/plugins/keepnick.rs b/src/plugins/keepnick.rs
index 6ba16c1..5a26a95 100644
--- a/src/plugins/keepnick.rs
+++ b/src/plugins/keepnick.rs
@@ -2,11 +2,11 @@ use std::marker::PhantomData;
 
 use irc::client::prelude::*;
 
-use plugin::*;
-use FrippyClient;
+use crate::plugin::*;
+use crate::FrippyClient;
 
-use error::ErrorKind as FrippyErrorKind;
-use error::FrippyError;
+use crate::error::ErrorKind as FrippyErrorKind;
+use crate::error::FrippyError;
 use failure::ResultExt;
 
 #[derive(PluginName, Default, Debug)]
diff --git a/src/plugins/quote/mod.rs b/src/plugins/quote/mod.rs
index 4f7827b..97740c9 100644
--- a/src/plugins/quote/mod.rs
+++ b/src/plugins/quote/mod.rs
@@ -8,14 +8,14 @@ use irc::client::prelude::*;
 use rand::{thread_rng, Rng};
 use time;
 
-use plugin::*;
-use FrippyClient;
+use crate::plugin::*;
+use crate::FrippyClient;
 pub mod database;
 use self::database::Database;
 
 use self::error::*;
-use error::ErrorKind as FrippyErrorKind;
-use error::FrippyError;
+use crate::error::ErrorKind as FrippyErrorKind;
+use crate::error::FrippyError;
 use failure::ResultExt;
 
 enum QuoteResponse {
diff --git a/src/plugins/remind/mod.rs b/src/plugins/remind/mod.rs
index 2a8a093..1e464b4 100644
--- a/src/plugins/remind/mod.rs
+++ b/src/plugins/remind/mod.rs
@@ -8,8 +8,8 @@ use irc::client::prelude::*;
 use chrono::{self, NaiveDateTime};
 use time;
 
-use plugin::*;
-use FrippyClient;
+use crate::plugin::*;
+use crate::FrippyClient;
 
 pub mod database;
 mod parser;
@@ -17,8 +17,8 @@ use self::database::Database;
 use self::parser::CommandParser;
 
 use self::error::*;
-use error::ErrorKind as FrippyErrorKind;
-use error::FrippyError;
+use crate::error::ErrorKind as FrippyErrorKind;
+use crate::error::FrippyError;
 use failure::ResultExt;
 
 fn get_time() -> NaiveDateTime {
diff --git a/src/plugins/sed.rs b/src/plugins/sed.rs
index 2c8522f..3b2ffa4 100644
--- a/src/plugins/sed.rs
+++ b/src/plugins/sed.rs
@@ -7,12 +7,12 @@ use regex::{Regex, RegexBuilder, Captures};
 
 use irc::client::prelude::*;
 
-use plugin::*;
-use FrippyClient;
+use crate::plugin::*;
+use crate::FrippyClient;
 
 use self::error::*;
-use error::ErrorKind as FrippyErrorKind;
-use error::FrippyError;
+use crate::error::ErrorKind as FrippyErrorKind;
+use crate::error::FrippyError;
 use failure::Fail;
 use failure::ResultExt;
 
diff --git a/src/plugins/tell/mod.rs b/src/plugins/tell/mod.rs
index 2e3829f..16bf7eb 100644
--- a/src/plugins/tell/mod.rs
+++ b/src/plugins/tell/mod.rs
@@ -9,12 +9,12 @@ use humantime::format_duration;
 use std::time::Duration;
 use time;
 
-use plugin::*;
-use FrippyClient;
+use crate::plugin::*;
+use crate::FrippyClient;
 
 use self::error::*;
-use error::ErrorKind as FrippyErrorKind;
-use error::FrippyError;
+use crate::error::ErrorKind as FrippyErrorKind;
+use crate::error::FrippyError;
 use failure::Fail;
 use failure::ResultExt;
 use log::{debug, trace};
diff --git a/src/plugins/unicode.rs b/src/plugins/unicode.rs
index 49e4a59..9ba71c3 100644
--- a/src/plugins/unicode.rs
+++ b/src/plugins/unicode.rs
@@ -4,11 +4,11 @@ use std::marker::PhantomData;
 
 use irc::client::prelude::*;
 
-use plugin::*;
-use FrippyClient;
+use crate::plugin::*;
+use crate::FrippyClient;
 
-use error::ErrorKind as FrippyErrorKind;
-use error::FrippyError;
+use crate::error::ErrorKind as FrippyErrorKind;
+use crate::error::FrippyError;
 use failure::Fail;
 
 #[derive(PluginName, Default, Debug)]
diff --git a/src/plugins/url.rs b/src/plugins/url.rs
index a884c66..86c77b5 100644
--- a/src/plugins/url.rs
+++ b/src/plugins/url.rs
@@ -7,13 +7,13 @@ use irc::client::prelude::*;
 
 use regex::Regex;
 
-use plugin::*;
-use utils::Url;
-use FrippyClient;
+use crate::plugin::*;
+use crate::utils::Url;
+use crate::FrippyClient;
 
 use self::error::*;
-use error::ErrorKind as FrippyErrorKind;
-use error::FrippyError;
+use crate::error::ErrorKind as FrippyErrorKind;
+use crate::error::FrippyError;
 use failure::Fail;
 use failure::ResultExt;