Merge pull request #28 from sfackler/tokio-02

Update to async/await

.circleci/config.yml

@@ -22,7 +22,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: rust:1.26.0
+      - image: rustlang/rust:nightly
     environment:
       RUSTFLAGS: -D warnings
     steps:
@@ -33,6 +33,7 @@ jobs:
       - run: rustc --version > ~/rust-version
       - *RESTORE_DEPS
       - run: cargo test
+      - run: cargo test --no-default-features
       - *SAVE_DEPS
 
 workflows:

.gitignore

@@ -1,3 +1,5 @@
 target/
 Cargo.lock
 .vscode/
+.idea/
+*.iml

Cargo.toml

@@ -2,6 +2,7 @@
 name = "hyper-openssl"
 version = "0.7.1"
 authors = ["Steven Fackler <[email protected]>"]
+edition = "2018"
 description = "Hyper TLS support via OpenSSL"
 license = "MIT/Apache-2.0"
 repository = "https://github.com/sfackler/hyper-openssl"
@@ -16,15 +17,14 @@ runtime = ["hyper/runtime"]
 [dependencies]
 antidote = "1.0.0"
 bytes = "0.4"
-hyper = { version = "0.12.14", default-features = false }
-lazy_static = "1.0"
+hyper = { version = "=0.13.0-alpha.1", default-features = false }
 linked_hash_set = "0.1"
+once_cell = "1.0"
 openssl = "0.10.19"
 openssl-sys = "0.9.26"
-tokio-io = "0.1.2"
-tokio-openssl = "0.3"
-futures = "0.1.14"
+tokio = "=0.2.0-alpha.4"
+tokio-openssl = "=0.4.0-alpha.4"
 
 [dev-dependencies]
-hyper = "0.12"
-tokio = "0.1"
+futures-preview = "=0.3.0-alpha.18"
+hyper = "=0.13.0-alpha.1"