Dependency upgrades (jonhoo#7)

Author: soulstompp

Cargo.toml

@@ -23,15 +23,15 @@ codecov = { repository = "jonhoo/msql-srv", branch = "master", service = "github
 maintenance = { status = "experimental" }
 
 [dependencies]
-nom = "4.0.0-beta3"
+nom = "4.2.3"
 mysql_common = "0.5"
 byteorder = "1"
 chrono = "0.4"
 
 [dev-dependencies]
-postgres = "0.15"
-mysql = "15.1.0"
-mysql_async = "0.14"
-slab = "0.4"
-tokio-core = "0.1"
-futures = "0.1"
+postgres = "0.15.2"
+mysql = "16.0.0"
+mysql_async = "0.19.0"
+slab = "0.4.2"
+tokio = "0.1.19"
+futures = "0.1.26"

appveyor.yml

@@ -56,7 +56,7 @@ install:
   # install Rust
   - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
   - rustup-init -yv --default-toolchain %channel% --default-host %target%
-  - set PATH=%PATH%;%USERPROFILE%\.cargo\bin
+  - set PATH=%PATH%;%USERPROFILE%\.cargo\bin;c:\MinGW\bin
   - rustc -vV
   - cargo -vV
 

tests/async.rs

@@ -4,14 +4,13 @@ extern crate msql_srv;
 extern crate mysql_async;
 extern crate mysql_common as myc;
 extern crate nom;
-extern crate tokio_core;
+extern crate tokio;
 
 use futures::{Future, IntoFuture};
 use mysql_async::prelude::*;
 use std::io;
 use std::net;
 use std::thread;
-use tokio_core::reactor::Core;
 
 use msql_srv::{
     Column, ErrorKind, MysqlIntermediary, MysqlShim, ParamParser, QueryResultWriter,
@@ -93,7 +92,7 @@ where
 
     fn test<C, F>(self, c: C)
     where
-        F: IntoFuture<Item = (), Error = mysql_async::errors::Error>,
+        F: IntoFuture<Item = (), Error = mysql_async::error::Error>,
         C: FnOnce(mysql_async::Conn) -> F,
     {
         let listener = net::TcpListener::bind("127.0.0.1:0").unwrap();
@@ -103,15 +102,11 @@ where
             MysqlIntermediary::run_on_tcp(self, s)
         });
 
-        let mut core = Core::new().unwrap();
-        let handle = core.handle();
-        let db = core
-            .run(mysql_async::Conn::new(
-                &format!("mysql://127.0.0.1:{}", port),
-                &handle,
-            ))
-            .unwrap();
-        core.run(c(db).into_future()).unwrap();
+        tokio::runtime::current_thread::block_on_all(
+            mysql_async::Conn::new(format!("mysql://127.0.0.1:{}", port)).and_then(|conn| c(conn)),
+        )
+        .unwrap();
+
         jh.join().unwrap().unwrap();
     }
 }
@@ -222,10 +217,11 @@ fn error_response() {
         db.query("SELECT a, b FROM foo").then(|r| {
             match r {
                 Ok(_) => assert!(false),
-                Err(mysql_async::errors::Error(
-                    mysql_async::errors::ErrorKind::Server(ref state, code, ref msg),
-                    _,
-                )) => {
+                Err(mysql_async::error::Error::Server(mysql_async::error::ServerError {
+                    code,
+                    message: ref msg,
+                    ref state,
+                })) => {
                     assert_eq!(
                         state,
                         &String::from_utf8(err.0.sqlstate().to_vec()).unwrap()