From 3614c7eb5dec834acdf18f81e486225db167be82 Mon Sep 17 00:00:00 2001
From: Adrian Malacoda <adrian.malacoda@monarch-pass.net>
Date: Sun, 18 Feb 2018 16:29:30 -0600
Subject: [PATCH] update all dependencies to latest version. Need to wait for
 discord-rs to update though

---
 Cargo.toml              | 14 +++++++-------
 src/lib.rs              |  4 ++--
 src/main.rs             | 37 ++++++++++++++++++-------------------
 src/modules/autolink.rs |  2 +-
 src/modules/discord.rs  |  2 +-
 src/modules/echo.rs     |  2 +-
 src/modules/echobox.rs  |  2 +-
 src/modules/loader.rs   |  2 +-
 src/modules/logger.rs   |  2 +-
 src/modules/lua.rs      |  3 ++-
 src/modules/mod.rs      |  2 +-
 src/modules/pvn.rs      |  2 +-
 src/modules/random.rs   |  4 ++--
 src/modules/stdin.rs    |  2 +-
 14 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 933ed9a..3982e17 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,16 +1,16 @@
 [package]
 name="tenquestionmarks"
-version="0.0.2"
+version="0.0.3"
 authors=["Adrian Malacoda <adrian.malacoda@monarch-pass.net>"]
 
 [dependencies]
-hlua = "0.3"
+hlua = "0.4.1"
 discord = "0.8.0"
-toml = "0.2.1"
-crossbeam = "0.2"
-rand = "0.3"
-log = "0.3.6"
-env_logger = "0.4.0"
+toml = "0.4.5"
+crossbeam = "0.3.2"
+rand = "0.4.2"
+log = "0.4.1"
+env_logger = "0.5.3"
 transformable_channels = "0.1.1"
 time = "0.1"
 regex = "0.2"
diff --git a/src/lib.rs b/src/lib.rs
index b7fafad..eef2532 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,7 +12,7 @@ extern crate regex;
 extern crate hlua;
 
 use std::collections::BTreeMap;
-use toml::Table;
+use toml::value::Table;
 
 mod modules;
 use modules::Module;
@@ -177,7 +177,7 @@ struct Subscription {
 impl Subscription {
     pub fn new (name: String, module: Module) -> Subscription {
         let filters: Vec<Box<EventFilter>> = module.config.get("filters")
-                                                          .and_then(|value| value.as_slice())
+                                                          .and_then(|value| value.as_array())
                                                           .map(|value| value.to_vec())
                                                           .unwrap_or(vec![])
                                                           .into_iter()
diff --git a/src/main.rs b/src/main.rs
index d950bed..03b2d6f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,12 +1,11 @@
 use std::env;
 use std::fs::File;
-use std::io::Read;
+use std::io::{Read, Write};
 
 extern crate tenquestionmarks;
 use tenquestionmarks::Tenquestionmarks;
 
 extern crate toml;
-use toml::Parser;
 
 #[macro_use]
 extern crate log;
@@ -15,17 +14,17 @@ extern crate env_logger;
 extern crate time;
 
 fn init_logger () {
-    let mut builder = env_logger::LogBuilder::new();
-    builder.format(|record: &log::LogRecord| {
+    let mut builder = env_logger::Builder::new();
+    builder.format(|buf, record: &log::Record| {
         let t = time::now();
-        format!("{} {}:{}: {}", time::strftime("%Y-%m-%d %H:%M:%S", &t).unwrap(), record.level(), record.location().module_path(), record.args())
-    }).filter(None, log::LogLevelFilter::Info);;
+        writeln!(buf, "{} {}:{}: {}", time::strftime("%Y-%m-%d %H:%M:%S", &t).unwrap(), record.level(), record.module_path().unwrap_or("?"), record.args())
+    }).filter(None, log::LevelFilter::Info);;
 
     if env::var("RUST_LOG").is_ok() {
        builder.parse(&env::var("RUST_LOG").unwrap());
     }
 
-    builder.init().unwrap();
+    builder.init();
 }
 
 fn main () {
@@ -37,18 +36,18 @@ fn main () {
         if let Err(e) = file.read_to_string(&mut contents) {
             error!("Failed to open config file {}: {:?}", config_file_name, e);
         } else {
-            let mut parser = Parser::new(&contents);
-            if let Some(configuration) = parser.parse() {
-                info!("Loaded configuration from: {}", config_file_name);
-                match Tenquestionmarks::from_configuration(configuration) {
-                    Ok(tqm) => {
-                        info!("tenquestionmarks initialized successfully");
-                        tqm.run();
-                    },
-                    Err(e) => error!("Failed to initialize tenquestionmarks: {:?}", e)
-                }
-            } else {
-                error!("Failed to parse config file {}: {:?}. Config file must be a valid TOML file.", config_file_name, parser.errors);
+            match toml::from_str(&contents) {
+                Ok(configuration) => {
+                    info!("Loaded configuration from: {}", config_file_name);
+                    match Tenquestionmarks::from_configuration(configuration) {
+                        Ok(tqm) => {
+                            info!("tenquestionmarks initialized successfully");
+                            tqm.run();
+                        },
+                        Err(e) => error!("Failed to initialize tenquestionmarks: {:?}", e)
+                    }
+                },
+                Err(error) => error!("Failed to parse config file {}: {:?}. Config file must be a valid TOML file.", config_file_name, error)
             }
         }
     } else {
diff --git a/src/modules/autolink.rs b/src/modules/autolink.rs
index 2780ac6..64c8a2a 100644
--- a/src/modules/autolink.rs
+++ b/src/modules/autolink.rs
@@ -1,5 +1,5 @@
 use modules::{Module, EventLoop};
-use toml::Table;
+use toml::value::Table;
 
 use std::sync::Arc;
 use std::sync::mpsc::Receiver;
diff --git a/src/modules/discord.rs b/src/modules/discord.rs
index cfac717..c84ff45 100644
--- a/src/modules/discord.rs
+++ b/src/modules/discord.rs
@@ -4,7 +4,7 @@ use discord::model::{Event, PossibleServer};
 
 use modules::Module;
 use modules::EventLoop;
-use toml::Table;
+use toml::value::Table;
 
 use event;
 use event::Envelope;
diff --git a/src/modules/echo.rs b/src/modules/echo.rs
index 1da86a2..a08e955 100644
--- a/src/modules/echo.rs
+++ b/src/modules/echo.rs
@@ -1,5 +1,5 @@
 use modules::{Module, EventLoop};
-use toml::Table;
+use toml::value::Table;
 
 use std::sync::Arc;
 use std::sync::mpsc::Receiver;
diff --git a/src/modules/echobox.rs b/src/modules/echobox.rs
index 49b86a6..71fa4c7 100644
--- a/src/modules/echobox.rs
+++ b/src/modules/echobox.rs
@@ -1,5 +1,5 @@
 use modules::{Module, EventLoop};
-use toml::Table;
+use toml::value::Table;
 
 use std::sync::Arc;
 use std::sync::mpsc::Receiver;
diff --git a/src/modules/loader.rs b/src/modules/loader.rs
index 9ead7ca..1562c29 100644
--- a/src/modules/loader.rs
+++ b/src/modules/loader.rs
@@ -2,7 +2,7 @@ use std::collections::BTreeMap;
 use std::error::Error;
 use std::fmt;
 
-use toml::Table;
+use toml::value::Table;
 
 use modules::Module;
 use modules::discord::DiscordModule;
diff --git a/src/modules/logger.rs b/src/modules/logger.rs
index a549c6e..da7da2a 100644
--- a/src/modules/logger.rs
+++ b/src/modules/logger.rs
@@ -1,5 +1,5 @@
 use modules::{Module, EventLoop};
-use toml::Table;
+use toml::value::Table;
 
 use std::sync::Arc;
 use std::sync::mpsc::Receiver;
diff --git a/src/modules/lua.rs b/src/modules/lua.rs
index 67fee26..ada4c40 100644
--- a/src/modules/lua.rs
+++ b/src/modules/lua.rs
@@ -1,6 +1,7 @@
 use modules::{Module, EventLoop};
 
-use toml::{Table, Value};
+use toml::Value;
+use toml::value::Table;
 
 use hlua;
 use hlua::{Lua, LuaFunction, Push};
diff --git a/src/modules/mod.rs b/src/modules/mod.rs
index b9bef30..d5e7e20 100644
--- a/src/modules/mod.rs
+++ b/src/modules/mod.rs
@@ -17,7 +17,7 @@ use std::sync::Arc;
 use std::sync::mpsc::Receiver;
 use transformable_channels::mpsc::ExtSender;
 
-use toml::Table;
+use toml::value::Table;
 
 pub struct Module {
     event_loop: Box<EventLoop>,
diff --git a/src/modules/pvn.rs b/src/modules/pvn.rs
index 8aa67ab..67945e9 100644
--- a/src/modules/pvn.rs
+++ b/src/modules/pvn.rs
@@ -1,5 +1,5 @@
 use modules::{Module, EventLoop};
-use toml::Table;
+use toml::value::Table;
 
 use std::sync::Arc;
 use std::sync::mpsc::Receiver;
diff --git a/src/modules/random.rs b/src/modules/random.rs
index a3b57bd..85da1a9 100644
--- a/src/modules/random.rs
+++ b/src/modules/random.rs
@@ -1,5 +1,5 @@
 use modules::{Module, EventLoop};
-use toml::Table;
+use toml::value::Table;
 
 use std::sync::Arc;
 use std::sync::mpsc::Receiver;
@@ -21,7 +21,7 @@ impl RandomModule {
                                   .unwrap_or("?random");
 
         let responses = configuration.get("responses")
-                                     .and_then(|value| value.as_slice())
+                                     .and_then(|value| value.as_array())
                                      .map(|value| value.to_vec())
                                      .unwrap_or(vec![])
                                      .into_iter()
diff --git a/src/modules/stdin.rs b/src/modules/stdin.rs
index 62cf906..c135ae6 100644
--- a/src/modules/stdin.rs
+++ b/src/modules/stdin.rs
@@ -1,7 +1,7 @@
 use std::io;
 
 use modules::{Module, EventLoop};
-use toml::Table;
+use toml::value::Table;
 
 use {MessageSender, Message, User};