Update dependencies

This updates mainly to tokio 1.0 and hyper 0.14, but includes other
side dependency updates as well.

Author: daboross

Cargo.toml

@@ -37,24 +37,24 @@ log = "0.4"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-serde_ignored = "0.0.4"
-serde-tuple-vec-map = "0.2"
+serde_ignored = "0.1"
+serde-tuple-vec-map = "1.0"
 arrayvec = "0.5"
 time = "0.1"
 # HTTP
 futures = "0.3"
 url = "2.0"
-hyper = "0.13"
-bytes = "0.5"
+hyper = { version = "0.14", features = ["client", "http1", "stream"] }
+bytes = "1.0"
 # Sync HTTP wrapper
-tokio = { version = "0.2", optional = true }
-hyper-tls = { version = "0.4", optional = true }
+tokio = { version = "1.0", optional = true }
+hyper-tls = { version = "0.5", optional = true }
 # Websockets
-rand = "0.7"
+rand = "0.8"
 num = { version = "0.3", default-features = false }
 
 [features]
-sync = ["tokio", "hyper-tls"]
+sync = ["tokio", "hyper-tls", "tokio/rt-multi-thread"]
 protocol-docs = []
 default = ["sync"]
 # enables tests which modify game state (temporarily, but still)
@@ -71,7 +71,7 @@ clap = "2"
 # socket connections in ws-debug example
 futures01 = { package = "futures", version = "0.1" }
 tokio01 = { package = "tokio", version = "0.1" }
-websocket = "0.23"
+websocket = "0.26"
 # pretty printing in ws-debug.
 serde_json = "1"
 

src/error.rs

@@ -18,7 +18,7 @@ pub enum ErrorKind {
     /// URL parsing error.
     Url(url::ParseError),
     /// Error connecting to the server, or error parsing a URL provided.
-    Hyper(hyper::error::Error),
+    Hyper(hyper::Error),
     /// IO error.
     Io(io::Error),
     /// Error for when the server responds with a non-success HTTP status code.
@@ -164,8 +164,8 @@ impl From<serde_json::error::Error> for Error {
     }
 }
 
-impl From<hyper::error::Error> for Error {
-    fn from(err: hyper::error::Error) -> Error {
+impl From<hyper::Error> for Error {
+    fn from(err: hyper::Error) -> Error {
         ErrorKind::Hyper(err).into()
     }
 }

src/lib.rs

@@ -141,7 +141,7 @@ pub struct Api<C> {
     /// The authentication token.
     auth_token: TokenStorage,
     /// The hyper client.
-    client: hyper::Client<C>,
+    client: hyper::client::Client<C>,
 }
 
 impl<C> Clone for Api<C>
@@ -173,7 +173,7 @@ impl<C> Api<C> {
     /// The returned instance can be used to make anonymous calls. Use [`Api::with_token`] or
     /// [`Api::set_token`] to enable authenticated access.
     #[inline]
-    pub fn new(client: hyper::Client<C>) -> Self {
+    pub fn new(client: hyper::client::Client<C>) -> Self {
         Api {
             url: default_url(),
             client: client,

src/sync.rs

@@ -6,7 +6,7 @@ use std::{
 };
 
 use hyper::client::HttpConnector;
-use hyper::{self, Client};
+use hyper::{self, client::Client};
 use hyper_tls::HttpsConnector;
 
 use crate::{

src/websocket/connecting.rs

@@ -125,7 +125,7 @@ pub fn transform_url<U: AsRef<str> + ?Sized>(url: &U) -> Result<Url, UrlError> {
     impl fmt::Display for GenServerAndSessionId {
         fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
             let mut rng = rand::thread_rng();
-            write!(f, "../socket/{:04}/", rng.gen_range(0, 1000))?;
+            write!(f, "../socket/{:04}/", rng.gen_range(0..1000))?;
 
             for _ in 0..8 {
                 write!(f, "{}", *VALID_CHARS.choose(&mut rng).unwrap() as char)?;