upgrade to tokio v1

Signed-off-by: Petros Angelatos <[email protected]>

Author: petrosagg

README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.com/pubnub/rust.svg?branch=master)](https://travis-ci.com/pubnub/rust)
 [![unsafe forbidden](https://img.shields.io/badge/unsafe-forbidden-success.svg)](https://github.com/rust-secure-code/safety-dance/)
 
-The PubNub Rust SDK is based on Tokio `0.2`. This library uses `HTTP/2` to communicate with the PubNub Edge Messaging Network.
+The PubNub Rust SDK is based on Tokio `1.0`. This library uses `HTTP/2` to communicate with the PubNub Edge Messaging Network.
 
 ## MSRV
 

pubnub-hyper/Cargo.toml

@@ -20,11 +20,11 @@ error-iter = "0.2"
 futures-util = { version = "0.3", features = ["async-await", "async-await-macro"] }
 getset = "0.1"
 http = "0.2"
-hyper = { version = "0.13.3", features = ["stream"] }
-hyper-tls = "0.4"
+hyper = { version = "0.14", features = ["client", "http1", "http2", "stream"] }
+hyper-tls = "0.5"
 log = "0.4"
 thiserror = "1.0"
-tokio = "0.2"
+tokio = { version = "1", features = ["rt-multi-thread"] }
 
 [dev-dependencies]
 pubnub-test-util = { version = "0.1", path = "../pubnub-test-util" }
@@ -37,7 +37,7 @@ json = "0.12"
 log = "0.4"
 percent-encoding = "2.1"
 randomize = "3.0"
-tokio = { version = "0.2", features = ["macros"] }
+tokio = { version = "1", features = ["macros", "time"] }
 
 [badges]
 travis-ci = { repository = "pubnub/rust", branch = "master" }

pubnub-hyper/tests/common/mod.rs

@@ -5,9 +5,8 @@ pub fn init() {
 }
 
 pub fn current_thread_block_on<F: Future>(future: F) -> F::Output {
-    let mut rt = tokio::runtime::Builder::new()
+    let rt = tokio::runtime::Builder::new_current_thread()
         .enable_all()
-        .basic_scheduler()
         .build()
         .expect("unable to build tokio runtime");
     rt.block_on(future)

pubnub-hyper/tests/history.rs

@@ -10,7 +10,7 @@ mod common;
 /// Delay execution for the specified amount of milliseconds.
 async fn sleep(ms: u64) {
     info!(target: "pubnub", "Sleeping for {} ms", ms);
-    tokio::time::delay_for(std::time::Duration::from_millis(ms)).await
+    tokio::time::sleep(std::time::Duration::from_millis(ms)).await
 }
 
 /// Generate a string of random numbers.

pubnub-hyper/tests/presence.rs

@@ -16,7 +16,7 @@ const SAMPLE_UUID: &str = "903145ee-7c15-4579-aa5d-38a900717512";
 /// Delay execution for the specified amount of milliseconds.
 async fn sleep(ms: u64) {
     info!(target: "pubnub", "Sleeping for {} ms", ms);
-    tokio::time::delay_for(std::time::Duration::from_millis(ms)).await
+    tokio::time::sleep(std::time::Duration::from_millis(ms)).await
 }
 
 /// Generate a string of random numbers.