Merge remote-tracking branch 'upstream/master' into improve-error-han…

…dling
gotham-rs · Aug 26, 2020 · f0811f4 · f0811f4
2 parents b72348d + 86362f8
commit f0811f4
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/examples/handlers/multipart/Cargo.toml b/examples/handlers/multipart/Cargo.toml
@@ -11,4 +11,4 @@ gotham = { path = "../../../gotham" }
 
 mime = "0.3"
 futures = "0.3.1"
-multipart = { version = "0.16", default-features = false, features = ["server"] }
+multipart = { version = "0.17", default-features = false, features = ["server"] }
diff --git a/examples/hello_world_tls/Cargo.toml b/examples/hello_world_tls/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2018"
 
 [dependencies]
 gotham = { path = "../../gotham" }
-
+tokio-rustls = "0.14"
 mime = "0.3"
-futures-rustls = { git = "https://github.com/quininer/tokio-rustls", branch = "futures-rustls" }
+
diff --git a/examples/hello_world_tls/src/main.rs b/examples/hello_world_tls/src/main.rs
@@ -1,10 +1,10 @@
 //! A Hello World example application for working with Gotham.
-use futures_rustls::rustls::{
+use std::io::BufReader;
+use tokio_rustls::rustls::{
     self,
     internal::pemfile::{certs, pkcs8_private_keys},
     NoClientAuth,
 };
-use std::io::BufReader;
 
 use gotham::state::State;
 

diff --git a/examples/hello_world_until/Cargo.toml b/examples/hello_world_until/Cargo.toml
@@ -13,4 +13,4 @@ tokio = { version = "0.2.6", features = ["full"] }
 mime = "0.3"
 
 [target.'cfg(unix)'.dev-dependencies]
-nix = "0.15"
+nix = "0.18"
diff --git a/examples/templating/askama/Cargo.toml b/examples/templating/askama/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2018"
 [dependencies]
 gotham = { path = "../../../gotham" }
 
-askama = "0.9.0"
+askama = "0.10.3"
 mime = "0.3.12"
diff --git a/examples/websocket/Cargo.toml b/examples/websocket/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 gotham = { path = "../../gotham" }
 futures = "0.3.1"
-tokio-tungstenite = "0.10"
+tokio-tungstenite = "0.11"
 tokio = "0.2"
 pretty_env_logger = "0.4"
 sha1 = "*"

diff --git a/gotham/Cargo.toml b/gotham/Cargo.toml
@@ -47,7 +47,7 @@ http = "0.2"
 httpdate = "0.3"
 itertools = "0.9.0"
 anyhow = "1.0"
-tokio-rustls = { version = "0.12.1", optional = true }
+tokio-rustls = { version = "0.14.0", optional = true }
 
 [dev-dependencies]
 gotham_derive = { path = "../gotham_derive" }