From f7b717a01971642b921a25233051eb44c831a854 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Wed, 11 Sep 2024 16:05:47 -0400 Subject: [PATCH] chore: remove unused deps --- Cargo.lock | 20 +------------------ graphql/async-graphql/Cargo.toml | 3 --- graphql/juniper-advanced/Cargo.toml | 1 - graphql/juniper/Cargo.toml | 1 - https-tls/cert-watch/Cargo.toml | 3 --- middleware/encrypted-payloads/Cargo.toml | 4 +--- middleware/various/Cargo.toml | 2 -- templating/askama/Cargo.toml | 1 - templating/handlebars/Cargo.toml | 1 - templating/minijinja/Cargo.toml | 2 -- templating/sailfish/Cargo.toml | 2 -- templating/tera/Cargo.toml | 2 -- templating/yarte/Cargo.toml | 5 +++++ tracing/mainmatter-workshop/Cargo.toml | 1 - tracing/mainmatter-workshop/src/main.rs | 3 +-- tracing/mainmatter-workshop/src/middleware.rs | 2 +- tracing/mainmatter-workshop/src/routes.rs | 3 +-- websockets/echo/Cargo.toml | 5 ----- 18 files changed, 10 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e59c523..b51b11d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -989,7 +989,6 @@ version = "1.0.0" dependencies = [ "actix-cors", "actix-web", - "actix-web-lab", "async-graphql", "async-graphql-actix-web", "env_logger", @@ -2000,15 +1999,12 @@ dependencies = [ name = "cert-watch" version = "1.0.0" dependencies = [ - "actix-files", "actix-web", "color-eyre", "env_logger", "eyre", - "futures-util", "log", "notify 6.1.1", - "parking_lot", "rustls 0.23.13", "rustls-pemfile 2.1.3", "tokio", @@ -4349,7 +4345,6 @@ version = "1.0.0" dependencies = [ "actix-cors", "actix-web", - "actix-web-lab", "dotenvy", "env_logger", "juniper", @@ -4366,7 +4361,6 @@ version = "1.0.0" dependencies = [ "actix-cors", "actix-web", - "actix-web-lab", "env_logger", "juniper", "log", @@ -4739,9 +4733,8 @@ version = "1.0.0" dependencies = [ "actix-http", "actix-web", - "actix-web-lab", "aes-gcm-siv", - "base64 0.21.7", + "base64 0.22.1", "env_logger", "log", "serde", @@ -4787,7 +4780,6 @@ version = "1.0.0" dependencies = [ "actix-http", "actix-web", - "actix-web-lab", "env_logger", "futures-util", "log", @@ -7624,7 +7616,6 @@ name = "templating-askama" version = "1.0.0" dependencies = [ "actix-web", - "actix-web-lab", "askama", "env_logger", "log", @@ -7648,7 +7639,6 @@ name = "templating-handlebars" version = "1.0.0" dependencies = [ "actix-web", - "actix-web-lab", "env_logger", "handlebars 5.1.2", "serde_json", @@ -7660,7 +7650,6 @@ version = "1.0.0" dependencies = [ "actix-utils", "actix-web", - "actix-web-lab", "env_logger", "log", "minijinja", @@ -7672,7 +7661,6 @@ name = "templating-sailfish" version = "0.1.0" dependencies = [ "actix-web", - "actix-web-lab", "env_logger", "log", "sailfish", @@ -7683,7 +7671,6 @@ name = "templating-tera" version = "1.0.0" dependencies = [ "actix-web", - "actix-web-lab", "env_logger", "log", "tera", @@ -8334,7 +8321,6 @@ name = "tracing-mainmatter-workshop" version = "1.0.0" dependencies = [ "actix-web", - "actix-web-lab", "dotenvy", "metrics", "metrics-exporter-prometheus", @@ -8902,12 +8888,8 @@ dependencies = [ "actix-files", "actix-web", "actix-web-actors", - "awc", "env_logger", - "futures-util", "log", - "tokio", - "tokio-stream", ] [[package]] diff --git a/graphql/async-graphql/Cargo.toml b/graphql/async-graphql/Cargo.toml index edce38b..9e9adbb 100644 --- a/graphql/async-graphql/Cargo.toml +++ b/graphql/async-graphql/Cargo.toml @@ -5,12 +5,9 @@ edition = "2021" [dependencies] actix-web.workspace = true -actix-web-lab.workspace = true actix-cors.workspace = true - async-graphql = "6" async-graphql-actix-web = "6" - env_logger.workspace = true log.workspace = true slab = "0.4" diff --git a/graphql/juniper-advanced/Cargo.toml b/graphql/juniper-advanced/Cargo.toml index e31efdc..fbdfaa9 100644 --- a/graphql/juniper-advanced/Cargo.toml +++ b/graphql/juniper-advanced/Cargo.toml @@ -5,7 +5,6 @@ edition = "2021" [dependencies] actix-web.workspace = true -actix-web-lab.workspace = true actix-cors.workspace = true juniper = "0.16" mysql = "24" diff --git a/graphql/juniper/Cargo.toml b/graphql/juniper/Cargo.toml index f98367f..264a959 100644 --- a/graphql/juniper/Cargo.toml +++ b/graphql/juniper/Cargo.toml @@ -5,7 +5,6 @@ edition = "2021" [dependencies] actix-web.workspace = true -actix-web-lab.workspace = true actix-cors.workspace = true juniper = "0.16" env_logger.workspace = true diff --git a/https-tls/cert-watch/Cargo.toml b/https-tls/cert-watch/Cargo.toml index 6009fd2..b8cf8d0 100644 --- a/https-tls/cert-watch/Cargo.toml +++ b/https-tls/cert-watch/Cargo.toml @@ -5,14 +5,11 @@ edition = "2021" [dependencies] actix-web = { workspace = true, features = ["rustls-0_23"] } -actix-files.workspace = true color-eyre.workspace = true env_logger.workspace = true eyre.workspace = true -futures-util.workspace = true log.workspace = true notify = "6" rustls.workspace = true rustls-pemfile.workspace = true tokio = { workspace = true, features = ["time", "rt", "macros"] } -parking_lot.workspace = true diff --git a/middleware/encrypted-payloads/Cargo.toml b/middleware/encrypted-payloads/Cargo.toml index 64d88d0..ceaece4 100644 --- a/middleware/encrypted-payloads/Cargo.toml +++ b/middleware/encrypted-payloads/Cargo.toml @@ -7,10 +7,8 @@ edition.workspace = true [dependencies] actix-http.workspace = true actix-web.workspace = true -actix-web-lab.workspace = true - aes-gcm-siv = "0.11" -base64 = "0.21" +base64 = "0.22" env_logger.workspace = true log.workspace = true serde.workspace = true diff --git a/middleware/various/Cargo.toml b/middleware/various/Cargo.toml index 88ec25a..580b616 100644 --- a/middleware/various/Cargo.toml +++ b/middleware/various/Cargo.toml @@ -7,8 +7,6 @@ edition.workspace = true [dependencies] actix-http.workspace = true actix-web.workspace = true -actix-web-lab.workspace = true - env_logger.workspace = true futures-util.workspace = true log.workspace = true diff --git a/templating/askama/Cargo.toml b/templating/askama/Cargo.toml index 01d50b0..4a165f9 100644 --- a/templating/askama/Cargo.toml +++ b/templating/askama/Cargo.toml @@ -4,7 +4,6 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web-lab.workspace = true actix-web.workspace = true askama = "0.12" env_logger.workspace = true diff --git a/templating/handlebars/Cargo.toml b/templating/handlebars/Cargo.toml index 4079d49..340d87e 100644 --- a/templating/handlebars/Cargo.toml +++ b/templating/handlebars/Cargo.toml @@ -5,7 +5,6 @@ edition = "2021" [dependencies] actix-web.workspace = true -actix-web-lab.workspace = true env_logger.workspace = true handlebars = { version = "5", features = ["dir_source"] } serde_json.workspace = true diff --git a/templating/minijinja/Cargo.toml b/templating/minijinja/Cargo.toml index 5460340..f5b9054 100644 --- a/templating/minijinja/Cargo.toml +++ b/templating/minijinja/Cargo.toml @@ -5,9 +5,7 @@ edition = "2021" [dependencies] actix-web.workspace = true -actix-web-lab.workspace = true actix-utils.workspace = true - env_logger.workspace = true log.workspace = true minijinja = { version = "2", features = ["loader"] } diff --git a/templating/sailfish/Cargo.toml b/templating/sailfish/Cargo.toml index dd31fc2..f8b1068 100644 --- a/templating/sailfish/Cargo.toml +++ b/templating/sailfish/Cargo.toml @@ -5,8 +5,6 @@ edition = "2021" [dependencies] actix-web.workspace = true -actix-web-lab.workspace = true - env_logger.workspace = true log.workspace = true sailfish = "0.8" diff --git a/templating/tera/Cargo.toml b/templating/tera/Cargo.toml index 488cd4e..7734779 100644 --- a/templating/tera/Cargo.toml +++ b/templating/tera/Cargo.toml @@ -5,8 +5,6 @@ edition = "2021" [dependencies] actix-web.workspace = true -actix-web-lab.workspace = true - env_logger.workspace = true log.workspace = true tera = "1.8" diff --git a/templating/yarte/Cargo.toml b/templating/yarte/Cargo.toml index e3c0984..5cda319 100644 --- a/templating/yarte/Cargo.toml +++ b/templating/yarte/Cargo.toml @@ -4,6 +4,11 @@ version = "1.0.0" publish = false edition = "2021" +[package.metadata.cargo-machete] +ignored = [ + "yarte_helpers" # only used as build dependency +] + [dependencies] actix-web.workspace = true derive_more.workspace = true diff --git a/tracing/mainmatter-workshop/Cargo.toml b/tracing/mainmatter-workshop/Cargo.toml index e6f769e..d7f2408 100644 --- a/tracing/mainmatter-workshop/Cargo.toml +++ b/tracing/mainmatter-workshop/Cargo.toml @@ -7,7 +7,6 @@ rust-version.workspace = true [dependencies] actix-web.workspace = true -actix-web-lab.workspace = true dotenvy.workspace = true metrics = "0.23" metrics-exporter-prometheus = { version = "0.15", default-features = false } diff --git a/tracing/mainmatter-workshop/src/main.rs b/tracing/mainmatter-workshop/src/main.rs index 8115b70..c3e7e87 100644 --- a/tracing/mainmatter-workshop/src/main.rs +++ b/tracing/mainmatter-workshop/src/main.rs @@ -1,7 +1,6 @@ use std::io; -use actix_web::{middleware::from_fn, App, HttpServer}; -use actix_web_lab::extract::ThinData; +use actix_web::{middleware::from_fn, web::ThinData, App, HttpServer}; use tracing_actix_web::TracingLogger; mod logging; diff --git a/tracing/mainmatter-workshop/src/middleware.rs b/tracing/mainmatter-workshop/src/middleware.rs index 06748e1..e3eb194 100644 --- a/tracing/mainmatter-workshop/src/middleware.rs +++ b/tracing/mainmatter-workshop/src/middleware.rs @@ -4,9 +4,9 @@ use actix_web::{ body::MessageBody, dev::{ServiceRequest, ServiceResponse}, http::header::{HeaderName, HeaderValue}, + middleware::Next, HttpMessage as _, }; -use actix_web_lab::middleware::Next; use tracing_actix_web::RequestId; use crate::metric_names::*; diff --git a/tracing/mainmatter-workshop/src/routes.rs b/tracing/mainmatter-workshop/src/routes.rs index 12d3313..52767a0 100644 --- a/tracing/mainmatter-workshop/src/routes.rs +++ b/tracing/mainmatter-workshop/src/routes.rs @@ -1,7 +1,6 @@ use std::time::Duration; -use actix_web::{get, HttpResponse, Responder}; -use actix_web_lab::extract::ThinData; +use actix_web::{get, web::ThinData, HttpResponse, Responder}; use metrics_exporter_prometheus::PrometheusHandle; #[get("/hello")] diff --git a/websockets/echo/Cargo.toml b/websockets/echo/Cargo.toml index e649145..2ab6b83 100644 --- a/websockets/echo/Cargo.toml +++ b/websockets/echo/Cargo.toml @@ -16,10 +16,5 @@ actix.workspace = true actix-files.workspace = true actix-web.workspace = true actix-web-actors.workspace = true -awc.workspace = true - env_logger.workspace = true -futures-util = { workspace = true, features = ["sink"] } log.workspace = true -tokio = { workspace = true, features = ["full"] } -tokio-stream.workspace = true