From c3fd8e1315c6badfe4d96fcfba618547b4aea175 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Fri, 4 Mar 2022 16:28:40 +0000 Subject: [PATCH] update dependencies --- Cargo.lock | 62 +++++++++++----------------- auth/cookie-auth/Cargo.toml | 6 +-- auth/cookie-session/Cargo.toml | 4 +- auth/redis-session/Cargo.toml | 6 +-- auth/simple-auth-server/Cargo.toml | 2 +- basics/basics/Cargo.toml | 2 +- basics/todo/Cargo.toml | 2 +- cors/backend/Cargo.toml | 2 +- databases/redis/Cargo.toml | 5 ++- graphql/async-graphql/Cargo.toml | 3 +- graphql/juniper-advanced/Cargo.toml | 2 +- graphql/juniper/Cargo.toml | 2 +- http-proxy/Cargo.toml | 2 +- https-tls/awc-https/Cargo.toml | 2 +- json/json-validation/Cargo.toml | 2 +- protobuf/Cargo.toml | 4 +- websockets/chat-broker/Cargo.toml | 2 +- websockets/chat-broker/src/server.rs | 2 +- websockets/chat-tcp/Cargo.toml | 4 +- 19 files changed, 51 insertions(+), 65 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ec53514..64b13fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -98,23 +98,6 @@ dependencies = [ "tokio 1.17.0", ] -[[package]] -name = "actix-codec" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a36c014a3e811624313b51a227b775ecba55d36ef9462bbaac7d4f13e54c9271" -dependencies = [ - "bitflags", - "bytes 1.1.0", - "futures-core", - "futures-sink", - "log", - "memchr", - "pin-project-lite 0.2.8", - "tokio 1.17.0", - "tokio-util 0.6.9", -] - [[package]] name = "actix-codec" version = "0.5.0" @@ -177,7 +160,7 @@ version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5753ed977cb402da7f63445cfcca2f3e514189d516bd0b0d8cd1e24979bfcd3c" dependencies = [ - "actix-codec 0.5.0", + "actix-codec", "actix-rt", "actix-service", "actix-tls", @@ -215,7 +198,7 @@ version = "3.0.0-beta.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09594b8a7eaa15da5cfd0e25c779d4b1d6ded62d4a79904f1d91b0dcf97c78e7" dependencies = [ - "actix-codec 0.5.0", + "actix-codec", "actix-rt", "actix-server", "actix-service", @@ -393,7 +376,7 @@ version = "0.1.0-beta.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7919a113ef74b5d52218ea0bd310d0d1b0d2be822994716754e265f20734d601" dependencies = [ - "actix-codec 0.5.0", + "actix-codec", "actix-http", "actix-http-test", "actix-rt", @@ -416,7 +399,7 @@ version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fde0cf292f7cdc7f070803cb9a0d45c018441321a78b1042ffbbb81ec333297" dependencies = [ - "actix-codec 0.5.0", + "actix-codec", "actix-rt", "actix-service", "actix-utils", @@ -447,7 +430,7 @@ version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4e5ebffd51d50df56a3ae0de0e59487340ca456f05dd0b90c0a7a6dd6a74d31" dependencies = [ - "actix-codec 0.5.0", + "actix-codec", "actix-http", "actix-macros", "actix-router", @@ -489,7 +472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31efe7896f3933ce03dd4710be560254272334bb321a18fd8ff62b1a557d9d19" dependencies = [ "actix 0.13.0", - "actix-codec 0.5.0", + "actix-codec", "actix-http", "actix-web", "bytes 1.1.0", @@ -778,9 +761,9 @@ dependencies = [ [[package]] name = "async-graphql" -version = "3.0.31" +version = "3.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a994a60389a32a31304e46d437a11db46d5bbeb8c26de3dbfa309efd8b93e4" +checksum = "0963d76eb680488eb844e0ff9b0bb6249d5d293d3b322a4e6d6e7db4f9e13819" dependencies = [ "async-graphql-derive", "async-graphql-parser", @@ -808,11 +791,11 @@ dependencies = [ [[package]] name = "async-graphql-actix-web" -version = "3.0.31" +version = "3.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7df7399ff10b17ced5104c1046152ec8a05f3c8facb3b671fbe72ffed0c3ad" +checksum = "a9985cd828b76cf9d29a0eb23285809905f789da484a4d47a19adfd14c2ea50f" dependencies = [ - "actix 0.12.0", + "actix 0.13.0", "actix-http", "actix-web", "actix-web-actors", @@ -829,6 +812,7 @@ dependencies = [ name = "async-graphql-demo" version = "1.0.0" dependencies = [ + "actix 0.12.0", "actix-cors", "actix-web", "actix-web-lab", @@ -841,9 +825,9 @@ dependencies = [ [[package]] name = "async-graphql-derive" -version = "3.0.31" +version = "3.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71011bef5fef3019016b17fb8ba588d562c128d2d7ea93c86093352d5fd51ccf" +checksum = "f907d2577211fd0e542439e70e2ad17533fcf0208a2c84b47ff6e7eeb4d9b4fa" dependencies = [ "Inflector", "async-graphql-parser", @@ -857,9 +841,9 @@ dependencies = [ [[package]] name = "async-graphql-parser" -version = "3.0.31" +version = "3.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b4caccb492c65240591a193c3e90ac11018dd25670544ce07360b7116c6153" +checksum = "759f63930ab8203f285c2f2821d311d31210819a4b1f0626b5a2b554e92095bf" dependencies = [ "async-graphql-value", "pest", @@ -870,9 +854,9 @@ dependencies = [ [[package]] name = "async-graphql-value" -version = "3.0.31" +version = "3.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cd0d73a5a13fe9d1a7d5dd67c6394663dd531afb26a0c50c5da5b29cf7ba1f" +checksum = "35d22aaffb19bce9f28f3e614aa7a029e612e9042e36bd665882856dc4c7cb79" dependencies = [ "bytes 1.1.0", "indexmap", @@ -984,7 +968,7 @@ version = "3.0.0-beta.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d91ad5074d7d2d8be6ef74d4ecb79c0f4d5f58bdc7ec896d5fbaa9f2fb9bfa5e" dependencies = [ - "actix-codec 0.5.0", + "actix-codec", "actix-http", "actix-rt", "actix-service", @@ -4067,7 +4051,7 @@ dependencies = [ name = "protobuf-example" version = "1.0.0" dependencies = [ - "actix 0.12.0", + "actix 0.13.0", "actix-protobuf", "actix-web", "env_logger", @@ -6487,7 +6471,7 @@ name = "websocket" version = "1.0.0" dependencies = [ "actix 0.13.0", - "actix-codec 0.5.0", + "actix-codec", "actix-files", "actix-rt", "actix-web", @@ -6545,7 +6529,7 @@ name = "websocket-tcp-example" version = "1.0.0" dependencies = [ "actix 0.13.0", - "actix-codec 0.4.2", + "actix-codec", "actix-files", "actix-web", "actix-web-actors", @@ -6559,7 +6543,7 @@ dependencies = [ "serde_json", "tokio 1.17.0", "tokio-stream", - "tokio-util 0.6.9", + "tokio-util 0.7.0", ] [[package]] diff --git a/auth/cookie-auth/Cargo.toml b/auth/cookie-auth/Cargo.toml index 89e7482..eee02d3 100644 --- a/auth/cookie-auth/Cargo.toml +++ b/auth/cookie-auth/Cargo.toml @@ -5,6 +5,6 @@ edition = "2021" [dependencies] actix-web = "4" -actix-identity = "0.4.0-beta.8" -env_logger = "0.9.0" -rand = "0.8.4" +actix-identity = "0.4" +env_logger = "0.9" +rand = "0.8" diff --git a/auth/cookie-session/Cargo.toml b/auth/cookie-session/Cargo.toml index be5fe48..432470b 100644 --- a/auth/cookie-session/Cargo.toml +++ b/auth/cookie-session/Cargo.toml @@ -5,6 +5,6 @@ edition = "2021" [dependencies] actix-web = "4" -actix-session = "0.5.0-beta.7" +actix-session = "0.5" log = "0.4" -env_logger = "0.9.0" +env_logger = "0.9" diff --git a/auth/redis-session/Cargo.toml b/auth/redis-session/Cargo.toml index c3d7d83..0d9dd48 100644 --- a/auth/redis-session/Cargo.toml +++ b/auth/redis-session/Cargo.toml @@ -5,9 +5,9 @@ edition = "2021" [dependencies] actix-web = "4" -actix-session = "0.5.0-beta.7" -actix-redis = "0.10.0-beta.5" -env_logger = "0.9.0" +actix-session = "0.5" +actix-redis = "0.10" +env_logger = "0.9" serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/auth/simple-auth-server/Cargo.toml b/auth/simple-auth-server/Cargo.toml index 09fe89b..42cf764 100644 --- a/auth/simple-auth-server/Cargo.toml +++ b/auth/simple-auth-server/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] actix-web = "4" -actix-identity = "0.4.0-beta.8" +actix-identity = "0.4" chrono = { version = "0.4.6", features = ["serde"] } derive_more = "0.99.0" diff --git a/basics/basics/Cargo.toml b/basics/basics/Cargo.toml index 88fbf72..6135ad5 100644 --- a/basics/basics/Cargo.toml +++ b/basics/basics/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] actix-web = "4" actix-files = "0.6" -actix-session = "0.5.0-beta.7" +actix-session = "0.5" async-stream = "0.3" env_logger = "0.9" diff --git a/basics/todo/Cargo.toml b/basics/todo/Cargo.toml index fdd66e5..d47dac9 100644 --- a/basics/todo/Cargo.toml +++ b/basics/todo/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] actix-web = "4" actix-files = "0.6" -actix-session = "0.5.0-beta.7" +actix-session = "0.5" dotenv = "0.15" env_logger = "0.9" diff --git a/cors/backend/Cargo.toml b/cors/backend/Cargo.toml index 1a8985f..07300e4 100644 --- a/cors/backend/Cargo.toml +++ b/cors/backend/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] actix-web = { version = "4", features = ["rustls"] } -actix-cors = "0.6.0-beta.8" +actix-cors = "0.6" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/databases/redis/Cargo.toml b/databases/redis/Cargo.toml index 91c35c7..beccb4d 100644 --- a/databases/redis/Cargo.toml +++ b/databases/redis/Cargo.toml @@ -5,10 +5,11 @@ edition = "2021" [dependencies] actix = "0.12" +actix-redis = "0.10" actix-web = "4" -actix-redis = "0.10.0-beta.6" + +env_logger = "0.9" futures-util = { version = "0.3.7", default-features = false, features = ["std"] } log = "0.4" redis-async = { version = "0.8", default_features = false, features = ["tokio10"] } serde = { version = "1", features = ["derive"] } -env_logger = "0.9" diff --git a/graphql/async-graphql/Cargo.toml b/graphql/async-graphql/Cargo.toml index fec0aa2..94d1874 100644 --- a/graphql/async-graphql/Cargo.toml +++ b/graphql/async-graphql/Cargo.toml @@ -4,9 +4,10 @@ version = "1.0.0" edition = "2021" [dependencies] +actix = "0.12" actix-web = "4" actix-web-lab = "0.10" -actix-cors = "0.6.0-beta.10" +actix-cors = "0.6" async-graphql = "3" async-graphql-actix-web = "3" diff --git a/graphql/juniper-advanced/Cargo.toml b/graphql/juniper-advanced/Cargo.toml index b831043..da1fbc3 100644 --- a/graphql/juniper-advanced/Cargo.toml +++ b/graphql/juniper-advanced/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] actix-web = "4" actix-web-lab = "0.10" -actix-cors = "0.6.0-beta.10" +actix-cors = "0.6" juniper = "0.15" diff --git a/graphql/juniper/Cargo.toml b/graphql/juniper/Cargo.toml index 153a3f0..d1e78de 100644 --- a/graphql/juniper/Cargo.toml +++ b/graphql/juniper/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] actix-web = "4" actix-web-lab = "0.10" -actix-cors = "0.6.0-beta.10" +actix-cors = "0.6" juniper = "0.15" diff --git a/http-proxy/Cargo.toml b/http-proxy/Cargo.toml index 1b84a0d..77135a8 100644 --- a/http-proxy/Cargo.toml +++ b/http-proxy/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] actix-web = { version = "4", features = ["openssl"] } -awc = "3.0.0-beta.19" +awc = "3.0.0-beta.21" clap = { version = "3", features = ["derive"] } env_logger = "0.9" diff --git a/https-tls/awc-https/Cargo.toml b/https-tls/awc-https/Cargo.toml index aa02e56..badc162 100644 --- a/https-tls/awc-https/Cargo.toml +++ b/https-tls/awc-https/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] actix-web = "4" -awc = { version = "3.0.0-beta.19", features = ["rustls"] } +awc = { version = "3.0.0-beta.21", features = ["rustls"] } env_logger = "0.9" log = "0.4" diff --git a/json/json-validation/Cargo.toml b/json/json-validation/Cargo.toml index 1fd6535..a87d11f 100644 --- a/json/json-validation/Cargo.toml +++ b/json/json-validation/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] actix-web = "4" -awc = { version = "3.0.0-beta.19", features = ["openssl"] } +awc = { version = "3.0.0-beta.21", features = ["openssl"] } env_logger = "0.9" futures = "0.3.1" diff --git a/protobuf/Cargo.toml b/protobuf/Cargo.toml index 736eacf..856cc58 100644 --- a/protobuf/Cargo.toml +++ b/protobuf/Cargo.toml @@ -4,8 +4,8 @@ version = "1.0.0" edition = "2021" [dependencies] -actix = "0.12" -actix-protobuf = "0.7.0-beta.5" +actix = "0.13" +actix-protobuf = "0.7" actix-web = "4" env_logger = "0.9" log = "0.4" diff --git a/websockets/chat-broker/Cargo.toml b/websockets/chat-broker/Cargo.toml index 994991b..ba1b93c 100644 --- a/websockets/chat-broker/Cargo.toml +++ b/websockets/chat-broker/Cargo.toml @@ -9,7 +9,7 @@ path = "src/main.rs" [dependencies] actix = "0.13" -actix-broker = "0.4" +actix-broker = "0.4.2" actix-files = "0.6" actix-web = "4" actix-web-actors = "4.1" diff --git a/websockets/chat-broker/src/server.rs b/websockets/chat-broker/src/server.rs index f27793e..ed53337 100644 --- a/websockets/chat-broker/src/server.rs +++ b/websockets/chat-broker/src/server.rs @@ -49,7 +49,7 @@ impl WsChatServer { let mut room = self.take_room(room_name)?; for (id, client) in room.drain() { - if client.do_send(ChatMessage(msg.to_owned())).is_ok() { + if client.try_send(ChatMessage(msg.to_owned())).is_ok() { self.add_client_to_room(room_name, Some(id), client); } } diff --git a/websockets/chat-tcp/Cargo.toml b/websockets/chat-tcp/Cargo.toml index e696d5a..454b05c 100644 --- a/websockets/chat-tcp/Cargo.toml +++ b/websockets/chat-tcp/Cargo.toml @@ -13,7 +13,7 @@ path = "src/client.rs" [dependencies] actix = "0.13" -actix-codec = "0.4.1" +actix-codec = "0.5" actix-files = "0.6" actix-web = "4" actix-web-actors = "4.1" @@ -27,5 +27,5 @@ rand = "0.8" serde = { version = "1", features = ["derive"] } serde_json = "1" tokio = { version = "1.13.1", features = ["full"] } -tokio-util = { version = "0.6", features = ["codec"] } +tokio-util = { version = "0.7", features = ["codec"] } tokio-stream = "0.1.8"