From 91ffa11e19c2ebf9abd6f4883d9f4e487eb3523c Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Mon, 2 Jan 2023 20:33:43 +0000 Subject: [PATCH] move a couple more things to workspace deps --- Cargo.toml | 3 +++ auth/casbin/Cargo.toml | 4 ++-- auth/cookie-auth/Cargo.toml | 4 ++-- auth/cookie-session/Cargo.toml | 2 +- auth/redis-session/Cargo.toml | 4 ++-- auth/simple-auth-server/Cargo.toml | 4 ++-- background-jobs/Cargo.toml | 2 +- basics/basics/Cargo.toml | 4 ++-- basics/error-handling/Cargo.toml | 2 +- basics/hello-world/Cargo.toml | 2 +- basics/state/Cargo.toml | 2 +- basics/static-files/Cargo.toml | 4 ++-- basics/todo/Cargo.toml | 6 +++--- cors/backend/Cargo.toml | 2 +- data-factory/Cargo.toml | 2 +- databases/diesel/Cargo.toml | 2 +- databases/mongodb/Cargo.toml | 2 +- databases/postgres/Cargo.toml | 2 +- databases/redis/Cargo.toml | 4 ++-- databases/sqlite/Cargo.toml | 4 ++-- docker/Cargo.toml | 2 +- forms/form/Cargo.toml | 2 +- forms/multipart-s3/Cargo.toml | 10 +++++----- forms/multipart/Cargo.toml | 6 +++--- graphql/async-graphql/Cargo.toml | 8 ++++---- graphql/juniper-advanced/Cargo.toml | 6 +++--- graphql/juniper/Cargo.toml | 6 +++--- guards/Cargo.toml | 2 +- http-proxy/Cargo.toml | 6 +++--- http-proxy/src/main.rs | 3 ++- https-tls/awc-https/Cargo.toml | 2 +- https-tls/openssl-auto-le/Cargo.toml | 2 +- https-tls/rustls-client-cert/Cargo.toml | 2 +- https-tls/rustls/Cargo.toml | 4 ++-- json/json-decode-error/Cargo.toml | 2 +- json/json-error/Cargo.toml | 2 +- json/json-validation/Cargo.toml | 6 +++--- json/json/Cargo.toml | 4 ++-- json/jsonrpc/Cargo.toml | 4 ++-- .../middleware-encrypted-payloads/Cargo.toml | 8 ++++---- middleware/middleware-ext-mut/Cargo.toml | 2 +- middleware/middleware-http-to-https/Cargo.toml | 4 ++-- middleware/middleware/Cargo.toml | 8 ++++---- protobuf/Cargo.toml | 4 ++-- run-in-thread/Cargo.toml | 2 +- server-sent-events/Cargo.toml | 8 ++++---- shutdown-server/Cargo.toml | 4 ++-- templating/askama/Cargo.toml | 2 +- templating/fluent/Cargo.toml | 4 ++-- templating/handlebars/Cargo.toml | 2 +- templating/minijinja/Cargo.toml | 6 +++--- templating/sailfish/Cargo.toml | 4 ++-- templating/tera/Cargo.toml | 4 ++-- templating/tinytemplate/Cargo.toml | 2 +- templating/yarte/Cargo.toml | 2 +- unix-socket/Cargo.toml | 2 +- websockets/autobahn/Cargo.toml | 6 +++--- websockets/chat-actorless/Cargo.toml | 12 ++++++------ websockets/chat-broker/Cargo.toml | 10 +++++----- websockets/chat-tcp/Cargo.toml | 14 +++++++------- websockets/chat/Cargo.toml | 8 ++++---- websockets/echo-actorless/Cargo.toml | 12 ++++++------ websockets/echo/Cargo.toml | 16 ++++++++-------- 63 files changed, 145 insertions(+), 141 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index bd919a9..2d0c1b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -84,6 +84,9 @@ actix-web = "4" actix-web-actors = "4.1" actix-web-lab = "0.18" actix-ws = "0.2.5" +awc = "3" env_logger = "0.10" +futures-util = { version = "0.3.17", default-features = false, features = ["std"] } log = "0.4" +tokio = { version = "1.13.1", features = ["sync"] } diff --git a/auth/casbin/Cargo.toml b/auth/casbin/Cargo.toml index f1e9496..adf8ba2 100644 --- a/auth/casbin/Cargo.toml +++ b/auth/casbin/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true casbin = "2" loge = { version = "0.4", default-features = false, features = ["colored", "chrono"] } -tokio = { version = "1.13.1", features = ["sync"] } +tokio = { workspace = true, features = ["sync"] } diff --git a/auth/cookie-auth/Cargo.toml b/auth/cookie-auth/Cargo.toml index 522f736..3a5d5ef 100644 --- a/auth/cookie-auth/Cargo.toml +++ b/auth/cookie-auth/Cargo.toml @@ -4,8 +4,8 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } -actix-identity = { workspace = true } +actix-web.workspace = true +actix-identity.workspace = true actix-session = { workspace = true, features = ["cookie-session"] } env_logger.workspace = true diff --git a/auth/cookie-session/Cargo.toml b/auth/cookie-session/Cargo.toml index 8feaa84..12bb441 100644 --- a/auth/cookie-session/Cargo.toml +++ b/auth/cookie-session/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true actix-session = { workspace = true, features = ["cookie-session"] } log.workspace = true env_logger.workspace = true diff --git a/auth/redis-session/Cargo.toml b/auth/redis-session/Cargo.toml index 9dbf842..86a96a6 100644 --- a/auth/redis-session/Cargo.toml +++ b/auth/redis-session/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true actix-session = { workspace = true, features = ["redis-actor-session"] } env_logger.workspace = true @@ -13,5 +13,5 @@ serde = { version = "1", features = ["derive"] } serde_json = "1" [dev-dependencies] -actix-test = { workspace = true } +actix-test.workspace = true time = "0.3" diff --git a/auth/simple-auth-server/Cargo.toml b/auth/simple-auth-server/Cargo.toml index 53c3fc1..4ea61bd 100644 --- a/auth/simple-auth-server/Cargo.toml +++ b/auth/simple-auth-server/Cargo.toml @@ -4,8 +4,8 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } -actix-identity = { workspace = true } +actix-web.workspace = true +actix-identity.workspace = true actix-session = { workspace = true, features = ["cookie-session"] } chrono = { version = "0.4", features = ["serde"] } diff --git a/background-jobs/Cargo.toml b/background-jobs/Cargo.toml index af79dda..cbe505f 100644 --- a/background-jobs/Cargo.toml +++ b/background-jobs/Cargo.toml @@ -14,5 +14,5 @@ env_logger.workspace = true log.workspace = true rand = "0.8" serde = { version = "1", features = ["derive"] } -tokio = { version = "1.13.1", features = ["sync", "rt-multi-thread", "macros"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } tokio-util = "0.7.4" diff --git a/basics/basics/Cargo.toml b/basics/basics/Cargo.toml index 20ac414..20c35af 100644 --- a/basics/basics/Cargo.toml +++ b/basics/basics/Cargo.toml @@ -4,9 +4,9 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-files = { workspace = true } +actix-files.workspace = true actix-session = { workspace = true, features = ["cookie-session"] } -actix-web = { workspace = true } +actix-web.workspace = true async-stream = "0.3" env_logger.workspace = true diff --git a/basics/error-handling/Cargo.toml b/basics/error-handling/Cargo.toml index 6170504..be19893 100644 --- a/basics/error-handling/Cargo.toml +++ b/basics/error-handling/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true derive_more = "0.99.5" env_logger.workspace = true diff --git a/basics/hello-world/Cargo.toml b/basics/hello-world/Cargo.toml index a9206ce..ad8fb79 100644 --- a/basics/hello-world/Cargo.toml +++ b/basics/hello-world/Cargo.toml @@ -4,5 +4,5 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true env_logger.workspace = true diff --git a/basics/state/Cargo.toml b/basics/state/Cargo.toml index 7f5402b..57aaa18 100644 --- a/basics/state/Cargo.toml +++ b/basics/state/Cargo.toml @@ -4,5 +4,5 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true env_logger.workspace = true diff --git a/basics/static-files/Cargo.toml b/basics/static-files/Cargo.toml index 7ce6e88..98136fc 100644 --- a/basics/static-files/Cargo.toml +++ b/basics/static-files/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } -actix-files = { workspace = true } +actix-web.workspace = true +actix-files.workspace = true env_logger.workspace = true log.workspace = true diff --git a/basics/todo/Cargo.toml b/basics/todo/Cargo.toml index f26717d..dc79e0c 100644 --- a/basics/todo/Cargo.toml +++ b/basics/todo/Cargo.toml @@ -4,10 +4,10 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-files = { workspace = true } +actix-files.workspace = true actix-session = { workspace = true, features = ["cookie-session"] } -actix-web = { workspace = true } -actix-web-lab = { workspace = true } +actix-web.workspace = true +actix-web-lab.workspace = true dotenv = "0.15" env_logger.workspace = true diff --git a/cors/backend/Cargo.toml b/cors/backend/Cargo.toml index 3d6292e..8b83611 100644 --- a/cors/backend/Cargo.toml +++ b/cors/backend/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] actix-web = { workspace = true, features = ["rustls"] } -actix-cors = { workspace = true } +actix-cors.workspace = true env_logger.workspace = true serde = { version = "1.0", features = ["derive"] } diff --git a/data-factory/Cargo.toml b/data-factory/Cargo.toml index 4ffa048..96333c4 100644 --- a/data-factory/Cargo.toml +++ b/data-factory/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true env_logger.workspace = true log.workspace = true diff --git a/databases/diesel/Cargo.toml b/databases/diesel/Cargo.toml index d3afb04..118c491 100644 --- a/databases/diesel/Cargo.toml +++ b/databases/diesel/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true diesel = { version = "2", features = ["sqlite", "r2d2"] } dotenv = "0.15" env_logger.workspace = true diff --git a/databases/mongodb/Cargo.toml b/databases/mongodb/Cargo.toml index 51d5b84..ab3b714 100644 --- a/databases/mongodb/Cargo.toml +++ b/databases/mongodb/Cargo.toml @@ -4,6 +4,6 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true mongodb = "2" serde = { version = "1", features = ["derive"] } diff --git a/databases/postgres/Cargo.toml b/databases/postgres/Cargo.toml index 1e5b415..ecca1d6 100644 --- a/databases/postgres/Cargo.toml +++ b/databases/postgres/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true config = "0.13.1" deadpool-postgres = { version = "0.10.2", features = ["serde"] } derive_more = "0.99.17" diff --git a/databases/redis/Cargo.toml b/databases/redis/Cargo.toml index ceeafab..b4b7bee 100644 --- a/databases/redis/Cargo.toml +++ b/databases/redis/Cargo.toml @@ -4,10 +4,10 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true env_logger.workspace = true -futures-util = { version = "0.3.17", default-features = false, features = ["std"] } +futures-util.workspace = true log.workspace = true redis = { version = "0.22", default-features = false, features = ["tokio-comp", "connection-manager"] } serde = { version = "1", features = ["derive"] } diff --git a/databases/sqlite/Cargo.toml b/databases/sqlite/Cargo.toml index 042162f..7d88974 100644 --- a/databases/sqlite/Cargo.toml +++ b/databases/sqlite/Cargo.toml @@ -4,10 +4,10 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true env_logger.workspace = true -futures-util = { version = "0.3", default-features = false, features = ["std"] } +futures-util.workspace = true log.workspace = true r2d2 = "0.8" r2d2_sqlite = "0.20" # 0.21.0 blocked on sqlx sqlite update diff --git a/docker/Cargo.toml b/docker/Cargo.toml index 0845918..7ac9496 100644 --- a/docker/Cargo.toml +++ b/docker/Cargo.toml @@ -4,6 +4,6 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true env_logger.workspace = true log.workspace = true diff --git a/forms/form/Cargo.toml b/forms/form/Cargo.toml index 1638b86..e64e9a0 100644 --- a/forms/form/Cargo.toml +++ b/forms/form/Cargo.toml @@ -4,5 +4,5 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true serde = { version = "1", features = ["derive"] } diff --git a/forms/multipart-s3/Cargo.toml b/forms/multipart-s3/Cargo.toml index 5ce4f45..e5ebe7a 100644 --- a/forms/multipart-s3/Cargo.toml +++ b/forms/multipart-s3/Cargo.toml @@ -4,18 +4,18 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-multipart = { workspace = true } -actix-web = { workspace = true } -actix-web-lab = { workspace = true } +actix-multipart.workspace = true +actix-web.workspace = true +actix-web-lab.workspace = true aws-config = "0.51" aws-sdk-s3 = "0.21" dotenv = "0.15" env_logger.workspace = true -futures-util = { version = "0.3.17", default-features = false, features = ["std"] } +futures-util.workspace = true log.workspace = true sanitize-filename = "0.4" serde = { version = "1", features = ["derive"] } serde_json = "1" -tokio = { version = "1.13.1", features = ["io-util", "fs"] } +tokio = { workspace = true, features = ["io-util", "fs"] } diff --git a/forms/multipart/Cargo.toml b/forms/multipart/Cargo.toml index 79ba325..540bd6e 100644 --- a/forms/multipart/Cargo.toml +++ b/forms/multipart/Cargo.toml @@ -9,9 +9,9 @@ repository = "https://github.com/actix/examples" readme = "README.md" [dependencies] -actix-multipart = { workspace = true } -actix-web = { workspace = true } +actix-multipart.workspace = true +actix-web.workspace = true -futures-util = { version = "0.3.17", default-features = false, features = ["std"] } +futures-util.workspace = true sanitize-filename = "0.4" uuid = { version = "1", features = ["v4"] } diff --git a/graphql/async-graphql/Cargo.toml b/graphql/async-graphql/Cargo.toml index 5192ad7..81cd089 100644 --- a/graphql/async-graphql/Cargo.toml +++ b/graphql/async-graphql/Cargo.toml @@ -4,10 +4,10 @@ version = "1.0.0" edition = "2021" [dependencies] -actix = { workspace = true } -actix-web = { workspace = true } -actix-web-lab = { workspace = true } -actix-cors = { workspace = true } +actix.workspace = true +actix-web.workspace = true +actix-web-lab.workspace = true +actix-cors.workspace = true async-graphql = "5" async-graphql-actix-web = "5" diff --git a/graphql/juniper-advanced/Cargo.toml b/graphql/juniper-advanced/Cargo.toml index 48a5168..343e70d 100644 --- a/graphql/juniper-advanced/Cargo.toml +++ b/graphql/juniper-advanced/Cargo.toml @@ -4,9 +4,9 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } -actix-web-lab = { workspace = true } -actix-cors = { workspace = true } +actix-web.workspace = true +actix-web-lab.workspace = true +actix-cors.workspace = true juniper = "0.15" diff --git a/graphql/juniper/Cargo.toml b/graphql/juniper/Cargo.toml index 48bb76b..ff339e2 100644 --- a/graphql/juniper/Cargo.toml +++ b/graphql/juniper/Cargo.toml @@ -4,9 +4,9 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } -actix-web-lab = { workspace = true } -actix-cors = { workspace = true } +actix-web.workspace = true +actix-web-lab.workspace = true +actix-cors.workspace = true juniper = "0.15" diff --git a/guards/Cargo.toml b/guards/Cargo.toml index e36d989..1b0708e 100644 --- a/guards/Cargo.toml +++ b/guards/Cargo.toml @@ -4,4 +4,4 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true diff --git a/http-proxy/Cargo.toml b/http-proxy/Cargo.toml index 32f7c88..4ce754a 100644 --- a/http-proxy/Cargo.toml +++ b/http-proxy/Cargo.toml @@ -5,13 +5,13 @@ edition = "2021" [dependencies] actix-web = { workspace = true, features = ["openssl"] } -awc = "3" +awc.workspace = true clap = { version = "4", features = ["derive"] } env_logger.workspace = true -futures-util = { version = "0.3.17", default-features = false, features = ["std"] } +futures-util.workspace = true log.workspace = true reqwest = { version = "0.11", features = ["stream"] } -tokio = { version = "1.13.1", features = ["sync"] } +tokio.workspace = true tokio-stream = { version = "0.1.3", features = ["sync"] } url = "2.2" diff --git a/http-proxy/src/main.rs b/http-proxy/src/main.rs index d95ed59..113d306 100644 --- a/http-proxy/src/main.rs +++ b/http-proxy/src/main.rs @@ -7,6 +7,7 @@ use actix_web::{ use awc::Client; use clap::Parser; use futures_util::StreamExt as _; +use tokio::sync::mpsc; use tokio_stream::wrappers::UnboundedReceiverStream; use url::Url; @@ -71,7 +72,7 @@ async fn forward_reqwest( new_url.set_path(path); new_url.set_query(req.uri().query()); - let (tx, rx) = tokio::sync::mpsc::unbounded_channel(); + let (tx, rx) = mpsc::unbounded_channel(); actix_web::rt::spawn(async move { while let Some(chunk) = payload.next().await { diff --git a/https-tls/awc-https/Cargo.toml b/https-tls/awc-https/Cargo.toml index c08a65e..aa4766d 100644 --- a/https-tls/awc-https/Cargo.toml +++ b/https-tls/awc-https/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true awc = { version = "3", features = ["rustls"] } env_logger.workspace = true diff --git a/https-tls/openssl-auto-le/Cargo.toml b/https-tls/openssl-auto-le/Cargo.toml index f21bc94..dd39822 100644 --- a/https-tls/openssl-auto-le/Cargo.toml +++ b/https-tls/openssl-auto-le/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] actix-web = { workspace = true, features = ["openssl"] } -actix-files = { workspace = true } +actix-files.workspace = true acme-micro = "0.12" anyhow = "1" diff --git a/https-tls/rustls-client-cert/Cargo.toml b/https-tls/rustls-client-cert/Cargo.toml index 37faa37..48e6bef 100644 --- a/https-tls/rustls-client-cert/Cargo.toml +++ b/https-tls/rustls-client-cert/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-tls = { workspace = true } +actix-tls.workspace = true actix-web = { workspace = true, features = ["rustls"] } env_logger.workspace = true log.workspace = true diff --git a/https-tls/rustls/Cargo.toml b/https-tls/rustls/Cargo.toml index f1c9944..01b9a86 100644 --- a/https-tls/rustls/Cargo.toml +++ b/https-tls/rustls/Cargo.toml @@ -9,8 +9,8 @@ path = "src/main.rs" [dependencies] actix-web = { workspace = true, features = ["rustls"] } -actix-web-lab = { workspace = true } -actix-files = { workspace = true } +actix-web-lab.workspace = true +actix-files.workspace = true env_logger.workspace = true log.workspace = true diff --git a/json/json-decode-error/Cargo.toml b/json/json-decode-error/Cargo.toml index a0734ae..1ec786d 100644 --- a/json/json-decode-error/Cargo.toml +++ b/json/json-decode-error/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true env_logger.workspace = true log.workspace = true diff --git a/json/json-error/Cargo.toml b/json/json-error/Cargo.toml index a85d25a..10c6be9 100644 --- a/json/json-error/Cargo.toml +++ b/json/json-error/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true env_logger.workspace = true log.workspace = true diff --git a/json/json-validation/Cargo.toml b/json/json-validation/Cargo.toml index 63f8811..0ed6eff 100644 --- a/json/json-validation/Cargo.toml +++ b/json/json-validation/Cargo.toml @@ -4,11 +4,11 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } -awc = { version = "3", features = ["openssl"] } +actix-web.workspace = true +awc = { workspace = true, features = ["openssl"] } env_logger.workspace = true -futures-util = { version = "0.3.17", default-features = false, features = ["std"] } +futures-util.workspace = true log.workspace = true serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/json/json/Cargo.toml b/json/json/Cargo.toml index fa9c53e..dbeec69 100644 --- a/json/json/Cargo.toml +++ b/json/json/Cargo.toml @@ -4,10 +4,10 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true env_logger.workspace = true -futures-util = { version = "0.3.17", default-features = false, features = ["std"] } +futures-util.workspace = true json = "0.12" log.workspace = true serde = { version = "1.0", features = ["derive"] } diff --git a/json/jsonrpc/Cargo.toml b/json/jsonrpc/Cargo.toml index 510014e..9f7efe7 100644 --- a/json/jsonrpc/Cargo.toml +++ b/json/jsonrpc/Cargo.toml @@ -4,11 +4,11 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true bytes = "1.1.0" env_logger.workspace = true -futures-util = { version = "0.3.17", default-features = false, features = ["std"] } +futures-util.workspace = true log.workspace = true serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.78" diff --git a/middleware/middleware-encrypted-payloads/Cargo.toml b/middleware/middleware-encrypted-payloads/Cargo.toml index 9e7d1ef..799baf8 100644 --- a/middleware/middleware-encrypted-payloads/Cargo.toml +++ b/middleware/middleware-encrypted-payloads/Cargo.toml @@ -4,14 +4,14 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-http = { workspace = true } -actix-web = { workspace = true } -actix-web-lab = { workspace = true } +actix-http.workspace = true +actix-web.workspace = true +actix-web-lab.workspace = true aes-gcm-siv = "0.11" base64 = "0.20" env_logger.workspace = true -futures-util = { version = "0.3.17", default-features = false, features = ["std"] } +futures-util.workspace = true log.workspace = true pin-project = "1" serde = { version = "1", features = ["derive"] } diff --git a/middleware/middleware-ext-mut/Cargo.toml b/middleware/middleware-ext-mut/Cargo.toml index c290f8b..bec1f4f 100644 --- a/middleware/middleware-ext-mut/Cargo.toml +++ b/middleware/middleware-ext-mut/Cargo.toml @@ -4,6 +4,6 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true log.workspace = true env_logger.workspace = true diff --git a/middleware/middleware-http-to-https/Cargo.toml b/middleware/middleware-http-to-https/Cargo.toml index dad0d00..bec6dc1 100644 --- a/middleware/middleware-http-to-https/Cargo.toml +++ b/middleware/middleware-http-to-https/Cargo.toml @@ -5,10 +5,10 @@ edition = "2021" [dependencies] actix-web = { workspace = true, features = ["rustls"] } -actix-web-lab = { workspace = true } +actix-web-lab.workspace = true env_logger.workspace = true -futures-util = { version = "0.3.17", default-features = false, features = ["std"] } +futures-util.workspace = true log.workspace = true rustls = "0.20" rustls-pemfile = "1" diff --git a/middleware/middleware/Cargo.toml b/middleware/middleware/Cargo.toml index 3df616e..92b07da 100644 --- a/middleware/middleware/Cargo.toml +++ b/middleware/middleware/Cargo.toml @@ -4,11 +4,11 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-http = { workspace = true } -actix-web = { workspace = true } -actix-web-lab = { workspace = true } +actix-http.workspace = true +actix-web.workspace = true +actix-web-lab.workspace = true env_logger.workspace = true -futures-util = { version = "0.3.17", default-features = false, features = ["std"] } +futures-util.workspace = true log.workspace = true pin-project = "1" diff --git a/protobuf/Cargo.toml b/protobuf/Cargo.toml index 34e7728..ac100b6 100644 --- a/protobuf/Cargo.toml +++ b/protobuf/Cargo.toml @@ -4,8 +4,8 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-protobuf = { workspace = true } -actix-web = { workspace = true } +actix-protobuf.workspace = true +actix-web.workspace = true env_logger.workspace = true log.workspace = true diff --git a/run-in-thread/Cargo.toml b/run-in-thread/Cargo.toml index 748180b..92f31cc 100644 --- a/run-in-thread/Cargo.toml +++ b/run-in-thread/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" description = "Run Actix Web in separate thread" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true env_logger.workspace = true log.workspace = true diff --git a/server-sent-events/Cargo.toml b/server-sent-events/Cargo.toml index d0ca19b..43bcb4d 100644 --- a/server-sent-events/Cargo.toml +++ b/server-sent-events/Cargo.toml @@ -4,11 +4,11 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } -actix-web-lab = { workspace = true } +actix-web.workspace = true +actix-web-lab.workspace = true env_logger.workspace = true -futures-util = { version = "0.3.17", default-features = false, features = ["std"] } +futures-util.workspace = true log.workspace = true parking_lot = "0.12" -tokio = { version = "1.13.1", features = ["sync"] } +tokio.workspace = true tokio-stream = { version = "0.1.8", features = ["time"] } diff --git a/shutdown-server/Cargo.toml b/shutdown-server/Cargo.toml index 11abef5..33ea013 100644 --- a/shutdown-server/Cargo.toml +++ b/shutdown-server/Cargo.toml @@ -5,8 +5,8 @@ edition = "2021" description = "Send a request to the server to shut it down" [dependencies] -actix-web = { workspace = true } -actix-web-lab = { workspace = true } +actix-web.workspace = true +actix-web-lab.workspace = true env_logger.workspace = true log.workspace = true diff --git a/templating/askama/Cargo.toml b/templating/askama/Cargo.toml index f487aa7..8c5d355 100644 --- a/templating/askama/Cargo.toml +++ b/templating/askama/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] env_logger.workspace = true -actix-web = { workspace = true } +actix-web.workspace = true askama = "0.11.0" [build-dependencies] diff --git a/templating/fluent/Cargo.toml b/templating/fluent/Cargo.toml index db25a92..e386a63 100644 --- a/templating/fluent/Cargo.toml +++ b/templating/fluent/Cargo.toml @@ -4,8 +4,8 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } -actix-web-lab = { workspace = true } +actix-web.workspace = true +actix-web-lab.workspace = true fluent-templates = { version = "0.8", features = ["handlebars"] } handlebars = { version = "4.3", features = ["dir_source"] } serde = { version = "1", features = ["derive"] } diff --git a/templating/handlebars/Cargo.toml b/templating/handlebars/Cargo.toml index 63b13a6..3e68784 100644 --- a/templating/handlebars/Cargo.toml +++ b/templating/handlebars/Cargo.toml @@ -4,6 +4,6 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true handlebars = { version = "4.2.1", features = ["dir_source"] } serde_json = "1.0" diff --git a/templating/minijinja/Cargo.toml b/templating/minijinja/Cargo.toml index 7529c44..ec51542 100644 --- a/templating/minijinja/Cargo.toml +++ b/templating/minijinja/Cargo.toml @@ -4,9 +4,9 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } -actix-web-lab = { workspace = true } -actix-utils = { workspace = true } +actix-web.workspace = true +actix-web-lab.workspace = true +actix-utils.workspace = true env_logger.workspace = true log.workspace = true diff --git a/templating/sailfish/Cargo.toml b/templating/sailfish/Cargo.toml index ba9299b..b6fe15b 100644 --- a/templating/sailfish/Cargo.toml +++ b/templating/sailfish/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" edition = "2021" [dependencies] -actix-web = { workspace = true } -actix-web-lab = { workspace = true } +actix-web.workspace = true +actix-web-lab.workspace = true env_logger.workspace = true log.workspace = true diff --git a/templating/tera/Cargo.toml b/templating/tera/Cargo.toml index 04c77d6..04167a7 100644 --- a/templating/tera/Cargo.toml +++ b/templating/tera/Cargo.toml @@ -4,8 +4,8 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { workspace = true } -actix-web-lab = { workspace = true } +actix-web.workspace = true +actix-web-lab.workspace = true env_logger.workspace = true tera = "1.8.0" diff --git a/templating/tinytemplate/Cargo.toml b/templating/tinytemplate/Cargo.toml index 3cdffdb..73aad82 100644 --- a/templating/tinytemplate/Cargo.toml +++ b/templating/tinytemplate/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" [dependencies] env_logger.workspace = true tinytemplate = "1.1" -actix-web = { workspace = true } +actix-web.workspace = true serde_json = "1" diff --git a/templating/yarte/Cargo.toml b/templating/yarte/Cargo.toml index 2ce5c64..8f406fe 100644 --- a/templating/yarte/Cargo.toml +++ b/templating/yarte/Cargo.toml @@ -5,7 +5,7 @@ publish = false edition = "2021" [dependencies] -actix-web = { workspace = true } +actix-web.workspace = true env_logger.workspace = true yarte = { version = "0.15", features = ["bytes-buf", "html-min"] } derive_more = "0.99" diff --git a/unix-socket/Cargo.toml b/unix-socket/Cargo.toml index 50261eb..325c6bc 100644 --- a/unix-socket/Cargo.toml +++ b/unix-socket/Cargo.toml @@ -5,4 +5,4 @@ edition = "2021" [dependencies] env_logger.workspace = true -actix-web = { workspace = true } +actix-web.workspace = true diff --git a/websockets/autobahn/Cargo.toml b/websockets/autobahn/Cargo.toml index e25d05c..5494f3b 100644 --- a/websockets/autobahn/Cargo.toml +++ b/websockets/autobahn/Cargo.toml @@ -8,9 +8,9 @@ name = "websocket-autobahn-server" path = "src/main.rs" [dependencies] -actix = { workspace = true } -actix-web = { workspace = true } -actix-web-actors = { workspace = true } +actix.workspace = true +actix-web.workspace = true +actix-web-actors.workspace = true env_logger.workspace = true log.workspace = true diff --git a/websockets/chat-actorless/Cargo.toml b/websockets/chat-actorless/Cargo.toml index af6d929..c5267aa 100644 --- a/websockets/chat-actorless/Cargo.toml +++ b/websockets/chat-actorless/Cargo.toml @@ -4,14 +4,14 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-files = { workspace = true } -actix-web = { workspace = true } -actix-ws = { workspace = true } -awc = "3" +actix-files.workspace = true +actix-web.workspace = true +actix-ws.workspace = true +awc.workspace = true derive_more = "0.99.5" env_logger.workspace = true -futures-util = { version = "0.3.17", default-features = false, features = ["std"] } +futures-util.workspace = true log.workspace = true rand = "0.8" -tokio = { version = "1.13.1", features = ["rt", "macros", "sync", "time"] } +tokio = { workspace = true, features = ["rt", "time", "macros"] } diff --git a/websockets/chat-broker/Cargo.toml b/websockets/chat-broker/Cargo.toml index da4eb3c..c42cfaa 100644 --- a/websockets/chat-broker/Cargo.toml +++ b/websockets/chat-broker/Cargo.toml @@ -8,11 +8,11 @@ name = "server" path = "src/main.rs" [dependencies] -actix = { workspace = true } -actix-broker = { workspace = true } -actix-files = { workspace = true } -actix-web = { workspace = true } -actix-web-actors = { workspace = true } +actix.workspace = true +actix-broker.workspace = true +actix-files.workspace = true +actix-web.workspace = true +actix-web-actors.workspace = true env_logger.workspace = true log.workspace = true diff --git a/websockets/chat-tcp/Cargo.toml b/websockets/chat-tcp/Cargo.toml index 7aec89b..fe38a71 100644 --- a/websockets/chat-tcp/Cargo.toml +++ b/websockets/chat-tcp/Cargo.toml @@ -12,20 +12,20 @@ name = "websocket-tcp-client" path = "src/client.rs" [dependencies] -actix = { workspace = true } -actix-codec = { workspace = true } -actix-files = { workspace = true } -actix-web = { workspace = true } -actix-web-actors = { workspace = true } +actix.workspace = true +actix-codec.workspace = true +actix-files.workspace = true +actix-web.workspace = true +actix-web-actors.workspace = true byteorder = "1.2" bytes = "1" env_logger.workspace = true -futures-util = { version = "0.3.17", default-features = false, features = ["std", "sink"] } +futures-util = { workspace = true, features = ["sink"] } log.workspace = true rand = "0.8" serde = { version = "1", features = ["derive"] } serde_json = "1" -tokio = { version = "1.13.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } tokio-util = { version = "0.7", features = ["codec"] } tokio-stream = "0.1.8" diff --git a/websockets/chat/Cargo.toml b/websockets/chat/Cargo.toml index 4e6b584..6580fae 100644 --- a/websockets/chat/Cargo.toml +++ b/websockets/chat/Cargo.toml @@ -8,10 +8,10 @@ name = "websocket-chat-server" path = "src/main.rs" [dependencies] -actix = { workspace = true } -actix-files = { workspace = true } -actix-web = { workspace = true } -actix-web-actors = { workspace = true } +actix.workspace = true +actix-files.workspace = true +actix-web.workspace = true +actix-web-actors.workspace = true env_logger.workspace = true log.workspace = true diff --git a/websockets/echo-actorless/Cargo.toml b/websockets/echo-actorless/Cargo.toml index ea914db..cd93bd9 100644 --- a/websockets/echo-actorless/Cargo.toml +++ b/websockets/echo-actorless/Cargo.toml @@ -4,12 +4,12 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-files = { workspace = true } -actix-web = { workspace = true } -actix-ws = { workspace = true } -awc = "3" +actix-files.workspace = true +actix-web.workspace = true +actix-ws.workspace = true +awc.workspace = true env_logger.workspace = true -futures-util = { version = "0.3.17", default-features = false, features = ["std"] } +futures-util.workspace = true log.workspace = true -tokio = { version = "1.13.1", features = ["rt", "macros", "sync", "time"] } +tokio = { workspace = true, features = ["rt", "time", "macros"] } diff --git a/websockets/echo/Cargo.toml b/websockets/echo/Cargo.toml index 16f8f30..dc5df97 100644 --- a/websockets/echo/Cargo.toml +++ b/websockets/echo/Cargo.toml @@ -12,15 +12,15 @@ name = "websocket-client" path = "src/client.rs" [dependencies] -actix = { workspace = true } -actix-codec = { workspace = true } -actix-files = { workspace = true } -actix-web = { workspace = true } -actix-web-actors = { workspace = true } -awc = "3" +actix.workspace = true +actix-codec.workspace = true +actix-files.workspace = true +actix-web.workspace = true +actix-web-actors.workspace = true +awc.workspace = true env_logger.workspace = true -futures-util = { version = "0.3.17", default-features = false, features = ["std", "sink"] } +futures-util = { workspace = true, features = ["sink"] } log.workspace = true -tokio = { version = "1.13.1", features = ["full"] } +tokio = { workspace = true, features = ["full"] } tokio-stream = "0.1.8"