Skip to content

updated to tokio 1.0 #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions elasticsearch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
rustc_version = "0.2"
2 changes: 1 addition & 1 deletion elasticsearch/src/http/request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/src/root/bulk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions elasticsearch/tests/common/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion yaml_test_runner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }