Skip to content

Commit

Permalink
tokio 0.2 + std::future support (discord#2)
Browse files Browse the repository at this point in the history
  • Loading branch information
jhgg authored Jan 23, 2020
1 parent c4c1771 commit e95a3be
Show file tree
Hide file tree
Showing 18 changed files with 1,060 additions and 1,769 deletions.
32 changes: 18 additions & 14 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,35 @@ license = "MIT"
name = "etcd"
readme = "README.md"
repository = "https://github.com/jimmycuadra/rust-etcd"
version = "0.9.0"
version = "0.10.0"

[lib]
test = false

[dependencies]
futures = "0.1.25"
hyper = "0.12.13"
http = "0.1.13"
serde = "1.0.80"
serde_derive = "1.0.80"
serde_json = "1.0.32"
url = "1.7.1"
base64 = "0.10.0"
log = "0.4.6"
tokio = "0.1.13"
futures = "0.3"
hyper = "0.13"
http = "0.2"
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
url = "2.1"
base64 = "0.11"
log = "0.4"
tokio = { version = "0.2", features = ["rt-core", "test-util", "macros", "time"] }

[dependencies.hyper-tls]
optional = true
version = "0.3.1"
version = "0.4"

[dependencies.tokio-tls]
optional = true
version = "0.3"

[dependencies.native-tls]
optional = true
version = "0.2.2"
version = "0.2"

[features]
default = ["tls"]
tls = ["hyper-tls", "native-tls"]
tls = ["hyper-tls", "tokio-tls", "native-tls"]
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
volumes:
- ./tests/ssl:/ssl
rust:
image: rust:1.31.0
image: rust:1.40.0
environment:
RUST_BACKTRACE: 1
RUST_TEST_THREADS: 1
Expand Down
2 changes: 0 additions & 2 deletions rustfmt.toml

This file was deleted.

Loading

0 comments on commit e95a3be

Please sign in to comment.