Skip to content

Commit ecac915

Browse files
authored
updated to tokio 1.0 (#158)
1 parent 65093c7 commit ecac915

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

elasticsearch/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ rustls-tls = ["reqwest/rustls-tls"]
2323

2424
[dependencies]
2525
base64 = "^0.11"
26-
bytes = "^0.5"
26+
bytes = "^1.0"
2727
dyn-clone = "~1"
2828
percent-encoding = "2.1.0"
29-
reqwest = { version = "~0.10", default-features = false, features = ["gzip", "json"] }
29+
reqwest = { version = "~0.11", default-features = false, features = ["gzip", "json"] }
3030
url = "^2.1"
3131
serde = { version = "~1", features = ["derive"] }
3232
serde_json = "~1"
@@ -39,12 +39,12 @@ clap = "~2"
3939
failure = "0.1.5"
4040
futures = "0.3.1"
4141
http = "0.2"
42-
hyper = { version = "0.13", default-features = false, features = ["tcp", "stream"] }
42+
hyper = { version = "0.14", default-features = false, features = ["tcp", "stream", "server"] }
4343
os_type = "2.2"
4444
sysinfo = "0.12.0"
4545
textwrap = "^0.11"
46-
tokio = { version = "0.2.0", default-features = false, features = ["macros", "tcp", "time"] }
46+
tokio = { version = "1.0", default-features = false, features = ["macros", "net", "time", "rt-multi-thread"] }
4747
xml-rs = "^0.8"
4848

4949
[build-dependencies]
50-
rustc_version = "0.2"
50+
rustc_version = "0.2"

elasticsearch/src/http/request.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
//! HTTP request components
2020
2121
use crate::error::Error;
22-
use bytes::{buf::BufMutExt, BufMut, Bytes, BytesMut};
22+
use bytes::{BufMut, Bytes, BytesMut};
2323
use percent_encoding::AsciiSet;
2424
use serde::Serialize;
2525

elasticsearch/src/root/bulk.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use crate::{
2121
params::{SourceFilter, VersionType},
2222
Error,
2323
};
24-
use bytes::{buf::BufMutExt, BufMut, Bytes, BytesMut};
24+
use bytes::{BufMut, Bytes, BytesMut};
2525
use serde::{
2626
ser::{SerializeMap, Serializer},
2727
Deserialize, Serialize,

elasticsearch/tests/common/server.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ where
6262
{
6363
//Spawn new runtime in thread to prevent reactor execution context conflict
6464
thread::spawn(move || {
65-
let mut rt = runtime::Builder::new()
66-
.basic_scheduler()
65+
let rt = runtime::Builder::new_current_thread()
6766
.enable_all()
6867
.build()
6968
.expect("new rt");

yaml_test_runner/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ flate2 = "~1"
3838
globset = "~0.4"
3939

4040
[dev-dependencies]
41-
tokio = { version = "0.2.0", default-features = false, features = ["macros", "tcp", "time"] }
41+
tokio = { version = "1.0", default-features = false, features = ["macros", "net", "time"] }

0 commit comments

Comments
 (0)