Re-enable tokio-rustls now that it has a stable release (#429)

hyperium · Dec 1, 2019 · e7e75bf · e7e75bf
1 parent 4398e16
commit e7e75bf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -47,9 +47,9 @@ jobs:
         # TODO: Change it to stable after Rust 1.38 release
         run: ./ci/h2spec.sh
         if: matrix.rust == 'nightly'
-      #- name: Check minimal versions
-      #  run: cargo clean; cargo update -Zminimal-versions; cargo check
-      #  if: matrix.rust == 'nightly'
+      - name: Check minimal versions
+        run: cargo clean; cargo update -Zminimal-versions; cargo check
+        if: matrix.rust == 'nightly'
 
   publish_docs:
     name: Publish Documentation

diff --git a/Cargo.toml b/Cargo.toml
@@ -65,9 +65,7 @@ serde_json = "1.0.0"
 # Examples
 tokio = { version = "0.2", features = ["dns", "macros", "rt-core", "tcp"] }
 env_logger = { version = "0.5.3", default-features = false }
-# TODO: re-enable when tokio-rustls is updated
-#rustls = "0.16"
-#tokio-rustls = "0.12.0-alpha.4"
-#webpki = "0.21"
-#webpki-roots = "0.17"
-
+rustls = "0.16"
+tokio-rustls = "0.12.0"
+webpki = "0.21"
+webpki-roots = "0.17"
diff --git a/examples/akamai.rs b/examples/akamai.rs
@@ -1,5 +1,3 @@
-fn main() {}
-/* TODO: re-enable when tokio-rustls is updated
 use h2::client;
 use http::{Method, Request};
 use tokio::net::TcpStream;
@@ -75,4 +73,3 @@ pub async fn main() -> Result<(), Box<dyn Error>> {
     }
     Ok(())
 }
-*/