From b84e1d9fb4f259e63727620de892a8a8dcf1b2f7 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Wed, 8 Apr 2020 01:18:52 +0900 Subject: [PATCH] part3: Update dependencies --- Cargo.toml | 2 +- simple-auth-server/Cargo.toml | 4 ++-- state/Cargo.toml | 2 +- static_index/Cargo.toml | 2 +- template_askama/Cargo.toml | 4 ++-- template_handlebars/Cargo.toml | 4 ++-- template_handlebars/src/main.rs | 4 ++-- template_tera/Cargo.toml | 2 +- todo/Cargo.toml | 4 ++-- unix-socket/Cargo.toml | 2 +- web-cors/backend/Cargo.toml | 2 +- websocket-chat/Cargo.toml | 4 ++-- websocket-tcp-chat/Cargo.toml | 2 +- websocket/Cargo.toml | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0319017d..1e1d5dd7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,6 +10,7 @@ members = [ "cookie-auth", "cookie-session", "diesel", + "docker_sample", "error_handling", "form", "graphql-demo", @@ -48,5 +49,4 @@ members = [ "websocket-chat", # "websocket-chat-broker", "websocket-tcp-chat", - "docker_sample", ] diff --git a/simple-auth-server/Cargo.toml b/simple-auth-server/Cargo.toml index c2ee7008..5cc38aa2 100644 --- a/simple-auth-server/Cargo.toml +++ b/simple-auth-server/Cargo.toml @@ -13,8 +13,8 @@ argonautica = "0.2.0" chrono = { version = "0.4.6", features = ["serde"] } derive_more = "0.99.0" diesel = { version = "1.4.2", features = ["postgres", "uuidv07", "r2d2", "chrono"] } -dotenv = "0.14.1" -env_logger = "0.6" +dotenv = "0.15" +env_logger = "0.7" futures = "0.3.1" r2d2 = "0.8" lazy_static = "1.3.0" diff --git a/state/Cargo.toml b/state/Cargo.toml index adcb8bbd..6fc7de07 100644 --- a/state/Cargo.toml +++ b/state/Cargo.toml @@ -8,4 +8,4 @@ edition = "2018" actix-web = "2.0.0" actix-rt = "1.0.0" futures = "0.3.1" -env_logger = "0.6" +env_logger = "0.7" diff --git a/static_index/Cargo.toml b/static_index/Cargo.toml index 434e11c7..af5cc11e 100644 --- a/static_index/Cargo.toml +++ b/static_index/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] futures = "0.3.1" -env_logger = "0.6" +env_logger = "0.7" actix-web = "2.0.0" actix-files = "0.2.1" diff --git a/template_askama/Cargo.toml b/template_askama/Cargo.toml index 27c09722..c8672d1d 100644 --- a/template_askama/Cargo.toml +++ b/template_askama/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] actix-web = "2.0.0" actix-rt = "1.0.0" -askama = "0.8" +askama = "0.9" [build-dependencies] -askama = "0.8" +askama = "0.9" diff --git a/template_handlebars/Cargo.toml b/template_handlebars/Cargo.toml index c27518e8..dcae8704 100644 --- a/template_handlebars/Cargo.toml +++ b/template_handlebars/Cargo.toml @@ -7,5 +7,5 @@ edition = "2018" [dependencies] actix-web = "2.0.0" actix-rt = "1.0.0" -handlebars = "2.0.0" -serde_json = "1.0" \ No newline at end of file +handlebars = { version = "3.0.0", features = ["dir_source"] } +serde_json = "1.0" diff --git a/template_handlebars/src/main.rs b/template_handlebars/src/main.rs index c33f2db1..a0da7ffc 100644 --- a/template_handlebars/src/main.rs +++ b/template_handlebars/src/main.rs @@ -13,7 +13,7 @@ use std::io; // Macro documentation can be found in the actix_web_codegen crate #[get("/")] -async fn index(hb: web::Data) -> HttpResponse { +async fn index(hb: web::Data>) -> HttpResponse { let data = json!({ "name": "Handlebars" }); @@ -24,7 +24,7 @@ async fn index(hb: web::Data) -> HttpResponse { #[get("/{user}/{data}")] async fn user( - hb: web::Data, + hb: web::Data>, info: web::Path<(String, String)>, ) -> HttpResponse { let data = json!({ diff --git a/template_tera/Cargo.toml b/template_tera/Cargo.toml index 07759696..6e45269e 100644 --- a/template_tera/Cargo.toml +++ b/template_tera/Cargo.toml @@ -6,7 +6,7 @@ workspace = ".." edition = "2018" [dependencies] -env_logger = "0.6" +env_logger = "0.7" tera = "1.0" actix-web = "2.0.0" actix-rt = "1.0.0" diff --git a/todo/Cargo.toml b/todo/Cargo.toml index 4f39811e..3022972b 100644 --- a/todo/Cargo.toml +++ b/todo/Cargo.toml @@ -9,8 +9,8 @@ actix-web = "2.0.0" actix-files = "0.2.1" actix-session = "0.3.0" actix-rt = "1.0.0" -dotenv = "0.13.0" -env_logger = "0.5.10" +dotenv = "0.15" +env_logger = "0.7" futures = "0.3.1" log = "0.4.3" serde = { version = "1.0.69", features = ["derive"] } diff --git a/unix-socket/Cargo.toml b/unix-socket/Cargo.toml index 3e1e5895..0d924f67 100644 --- a/unix-socket/Cargo.toml +++ b/unix-socket/Cargo.toml @@ -6,6 +6,6 @@ workspace = ".." edition = "2018" [dependencies] -env_logger = "0.6" +env_logger = "0.7" actix-web = "2.0.0" actix-rt = "1.0.0" diff --git a/web-cors/backend/Cargo.toml b/web-cors/backend/Cargo.toml index 10c3d11a..fd9f2176 100644 --- a/web-cors/backend/Cargo.toml +++ b/web-cors/backend/Cargo.toml @@ -10,5 +10,5 @@ actix-web = "2.0.0" actix-cors = "0.2.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -env_logger = "0.6" +env_logger = "0.7" futures = "0.3" diff --git a/websocket-chat/Cargo.toml b/websocket-chat/Cargo.toml index dc2f35d4..c11360c0 100644 --- a/websocket-chat/Cargo.toml +++ b/websocket-chat/Cargo.toml @@ -15,10 +15,10 @@ actix-web = "2.0.0" actix-web-actors = "2.0.0" actix-files = "0.2.1" -rand = "0.6" +rand = "0.7" bytes = "0.5.3" byteorder = "1.1" futures = "0.3.1" -env_logger = "0.6" +env_logger = "0.7" serde = "1.0" serde_json = "1.0" diff --git a/websocket-tcp-chat/Cargo.toml b/websocket-tcp-chat/Cargo.toml index 8e3466d9..b62b8198 100644 --- a/websocket-tcp-chat/Cargo.toml +++ b/websocket-tcp-chat/Cargo.toml @@ -24,7 +24,7 @@ rand = "0.7" bytes = "0.5.3" byteorder = "1.2" futures = "0.3" -env_logger = "0.6" +env_logger = "0.7" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" tokio = "0.2.4" diff --git a/websocket/Cargo.toml b/websocket/Cargo.toml index 65d8ea85..7a256871 100644 --- a/websocket/Cargo.toml +++ b/websocket/Cargo.toml @@ -20,6 +20,6 @@ actix-web-actors = "2.0.0" actix-files = "0.2.1" actix-rt = "1.0.0" awc = "1.0.1" -env_logger = "0.6" +env_logger = "0.7" futures = "0.3.1" bytes = "0.5.3"