From 18ed6a34de4d11668fc780f4ff8714fc6f714a70 Mon Sep 17 00:00:00 2001
From: Kamil Rojewski <kamil.rojewski@gmail.com>
Date: Fri, 15 Jan 2021 15:10:56 +0100
Subject: [PATCH] updated to tokio 1.0

---
 elasticsearch/Cargo.toml             | 10 +++++-----
 elasticsearch/src/http/request.rs    |  2 +-
 elasticsearch/src/root/bulk.rs       |  2 +-
 elasticsearch/tests/common/server.rs |  3 +--
 yaml_test_runner/Cargo.toml          |  2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/elasticsearch/Cargo.toml b/elasticsearch/Cargo.toml
index 445d8af9..3de71fe3 100644
--- a/elasticsearch/Cargo.toml
+++ b/elasticsearch/Cargo.toml
@@ -23,10 +23,10 @@ rustls-tls = ["reqwest/rustls-tls"]
 
 [dependencies]
 base64 = "^0.11"
-bytes = "^0.5"
+bytes = "^1.0"
 dyn-clone = "~1"
 percent-encoding = "2.1.0"
-reqwest = { version = "~0.10", default-features = false, features = ["gzip", "json"] }
+reqwest = { version = "~0.11", default-features = false, features = ["gzip", "json"] }
 url = "^2.1"
 serde = { version = "~1", features = ["derive"] }
 serde_json = "~1"
@@ -39,12 +39,12 @@ clap = "~2"
 failure = "0.1.5"
 futures = "0.3.1"
 http = "0.2"
-hyper = { version = "0.13", default-features = false, features = ["tcp", "stream"] }
+hyper = { version = "0.14", default-features = false, features = ["tcp", "stream", "server"] }
 os_type = "2.2"
 sysinfo = "0.12.0"
 textwrap = "^0.11"
-tokio = { version = "0.2.0", default-features = false, features = ["macros", "tcp", "time"] }
+tokio = { version = "1.0", default-features = false, features = ["macros", "net", "time", "rt-multi-thread"] }
 xml-rs = "^0.8"
 
 [build-dependencies]
-rustc_version = "0.2"
\ No newline at end of file
+rustc_version = "0.2"
diff --git a/elasticsearch/src/http/request.rs b/elasticsearch/src/http/request.rs
index ecc31da5..8d57e42c 100644
--- a/elasticsearch/src/http/request.rs
+++ b/elasticsearch/src/http/request.rs
@@ -19,7 +19,7 @@
 //! HTTP request components
 
 use crate::error::Error;
-use bytes::{buf::BufMutExt, BufMut, Bytes, BytesMut};
+use bytes::{BufMut, Bytes, BytesMut};
 use percent_encoding::AsciiSet;
 use serde::Serialize;
 
diff --git a/elasticsearch/src/root/bulk.rs b/elasticsearch/src/root/bulk.rs
index 3b3cec58..0cd80502 100644
--- a/elasticsearch/src/root/bulk.rs
+++ b/elasticsearch/src/root/bulk.rs
@@ -21,7 +21,7 @@ use crate::{
     params::{SourceFilter, VersionType},
     Error,
 };
-use bytes::{buf::BufMutExt, BufMut, Bytes, BytesMut};
+use bytes::{BufMut, Bytes, BytesMut};
 use serde::{
     ser::{SerializeMap, Serializer},
     Deserialize, Serialize,
diff --git a/elasticsearch/tests/common/server.rs b/elasticsearch/tests/common/server.rs
index f058c355..9bb8415b 100644
--- a/elasticsearch/tests/common/server.rs
+++ b/elasticsearch/tests/common/server.rs
@@ -62,8 +62,7 @@ where
 {
     //Spawn new runtime in thread to prevent reactor execution context conflict
     thread::spawn(move || {
-        let mut rt = runtime::Builder::new()
-            .basic_scheduler()
+        let rt = runtime::Builder::new_current_thread()
             .enable_all()
             .build()
             .expect("new rt");
diff --git a/yaml_test_runner/Cargo.toml b/yaml_test_runner/Cargo.toml
index a1ca1df2..a97a4136 100644
--- a/yaml_test_runner/Cargo.toml
+++ b/yaml_test_runner/Cargo.toml
@@ -38,4 +38,4 @@ flate2 = "~1"
 globset = "~0.4"
 
 [dev-dependencies]
-tokio = { version = "0.2.0", default-features = false, features = ["macros", "tcp", "time"] }
+tokio = { version = "1.0", default-features = false, features = ["macros", "net", "time"] }