From 023158cfa89312af4cd1455bd32a8f22b63715b6 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Thu, 20 Jun 2024 02:14:35 +0100 Subject: [PATCH] chore: move lints to manifest --- Cargo.toml | 5 +++++ actix-cors/Cargo.toml | 3 +++ actix-cors/src/lib.rs | 1 - actix-identity/Cargo.toml | 3 +++ actix-identity/src/lib.rs | 3 +-- actix-limitation/Cargo.toml | 3 +++ actix-limitation/src/lib.rs | 3 +-- actix-protobuf/Cargo.toml | 3 +++ actix-protobuf/src/lib.rs | 2 -- actix-session/Cargo.toml | 3 +++ actix-session/src/lib.rs | 3 +-- actix-settings/Cargo.toml | 3 +++ actix-settings/src/lib.rs | 3 +-- actix-web-httpauth/Cargo.toml | 3 +++ actix-web-httpauth/src/lib.rs | 3 +-- actix-ws/Cargo.toml | 3 +++ actix-ws/src/lib.rs | 1 - 17 files changed, 34 insertions(+), 14 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5bab1ee25..27e27a8f0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,6 +18,11 @@ license = "MIT OR Apache-2.0" edition = "2021" rust-version = "1.75" +[workspace.lints.rust] +rust-2018-idioms = { level = "deny" } +nonstandard-style = { level = "deny" } +future-incompatible = { level = "deny" } + [patch.crates-io] actix-cors = { path = "./actix-cors" } actix-identity = { path = "./actix-identity" } diff --git a/actix-cors/Cargo.toml b/actix-cors/Cargo.toml index 4e97e67c7..cc5294455 100644 --- a/actix-cors/Cargo.toml +++ b/actix-cors/Cargo.toml @@ -34,3 +34,6 @@ smallvec = "1" actix-web = { version = "4", default-features = false, features = ["macros"] } env_logger = "0.11" regex = "1.4" + +[lints] +workspace = true diff --git a/actix-cors/src/lib.rs b/actix-cors/src/lib.rs index 49b82aa01..d5a67f740 100644 --- a/actix-cors/src/lib.rs +++ b/actix-cors/src/lib.rs @@ -49,7 +49,6 @@ //! [Private Network Access]: https://wicg.github.io/private-network-access #![forbid(unsafe_code)] -#![deny(rust_2018_idioms, nonstandard_style)] #![warn(future_incompatible, missing_docs, missing_debug_implementations)] #![doc(html_logo_url = "https://actix.rs/img/logo.png")] #![doc(html_favicon_url = "https://actix.rs/favicon.ico")] diff --git a/actix-identity/Cargo.toml b/actix-identity/Cargo.toml index 30d7c411a..30467faa4 100644 --- a/actix-identity/Cargo.toml +++ b/actix-identity/Cargo.toml @@ -36,3 +36,6 @@ actix-session = { version = "0.9", features = ["redis-session", "cookie-session" env_logger = "0.11" reqwest = { version = "0.11", default-features = false, features = ["cookies", "json"] } uuid = { version = "1", features = ["v4"] } + +[lints] +workspace = true diff --git a/actix-identity/src/lib.rs b/actix-identity/src/lib.rs index d5e08c8c5..aa3f98dba 100644 --- a/actix-identity/src/lib.rs +++ b/actix-identity/src/lib.rs @@ -93,8 +93,7 @@ In particular, you can automatically log out users who: */ #![forbid(unsafe_code)] -#![deny(rust_2018_idioms, nonstandard_style, missing_docs)] -#![warn(future_incompatible)] +#![deny(missing_docs)] #![doc(html_logo_url = "https://actix.rs/img/logo.png")] #![doc(html_favicon_url = "https://actix.rs/favicon.ico")] #![cfg_attr(docsrs, feature(doc_auto_cfg))] diff --git a/actix-limitation/Cargo.toml b/actix-limitation/Cargo.toml index c1d29d730..1510471ff 100644 --- a/actix-limitation/Cargo.toml +++ b/actix-limitation/Cargo.toml @@ -38,3 +38,6 @@ actix-session = { version = "0.9", optional = true } actix-web = "4" static_assertions = "1" uuid = { version = "1", features = ["v4"] } + +[lints] +workspace = true diff --git a/actix-limitation/src/lib.rs b/actix-limitation/src/lib.rs index 3263a5973..ca541f0b5 100644 --- a/actix-limitation/src/lib.rs +++ b/actix-limitation/src/lib.rs @@ -45,8 +45,7 @@ //! ``` #![forbid(unsafe_code)] -#![deny(rust_2018_idioms, nonstandard_style)] -#![warn(future_incompatible, missing_docs, missing_debug_implementations)] +#![warn(missing_docs, missing_debug_implementations)] #![doc(html_logo_url = "https://actix.rs/img/logo.png")] #![doc(html_favicon_url = "https://actix.rs/favicon.ico")] #![cfg_attr(docsrs, feature(doc_auto_cfg))] diff --git a/actix-protobuf/Cargo.toml b/actix-protobuf/Cargo.toml index 4dec844ff..8e0a15f26 100644 --- a/actix-protobuf/Cargo.toml +++ b/actix-protobuf/Cargo.toml @@ -26,3 +26,6 @@ prost = { version = "0.12", default-features = false } [dev-dependencies] actix-web = { version = "4", default-features = false, features = ["macros"] } prost = { version = "0.12", default-features = false, features = ["prost-derive"] } + +[lints] +workspace = true diff --git a/actix-protobuf/src/lib.rs b/actix-protobuf/src/lib.rs index adfba4f43..6c3e7f9b2 100644 --- a/actix-protobuf/src/lib.rs +++ b/actix-protobuf/src/lib.rs @@ -1,8 +1,6 @@ //! Protobuf payload extractor for Actix Web. #![forbid(unsafe_code)] -#![deny(rust_2018_idioms, nonstandard_style)] -#![warn(future_incompatible)] #![doc(html_logo_url = "https://actix.rs/img/logo.png")] #![doc(html_favicon_url = "https://actix.rs/favicon.ico")] #![cfg_attr(docsrs, feature(doc_auto_cfg))] diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml index e2fac3869..93b1bfc2c 100644 --- a/actix-session/Cargo.toml +++ b/actix-session/Cargo.toml @@ -46,6 +46,9 @@ actix-web = { version = "4", default-features = false, features = ["cookies", "s tracing-subscriber = { version = "0.3", features = ["env-filter"] } tracing = "0.1.30" +[lints] +workspace = true + [[example]] name = "basic" required-features = ["redis-session"] diff --git a/actix-session/src/lib.rs b/actix-session/src/lib.rs index a2ba475df..c42c701f9 100644 --- a/actix-session/src/lib.rs +++ b/actix-session/src/lib.rs @@ -138,8 +138,7 @@ //! [`RedisSessionStore`]: storage::RedisSessionStore #![forbid(unsafe_code)] -#![deny(rust_2018_idioms, nonstandard_style)] -#![warn(future_incompatible, missing_docs)] +#![warn(missing_docs)] #![doc(html_logo_url = "https://actix.rs/img/logo.png")] #![doc(html_favicon_url = "https://actix.rs/favicon.ico")] #![cfg_attr(docsrs, feature(doc_auto_cfg))] diff --git a/actix-settings/Cargo.toml b/actix-settings/Cargo.toml index b53f893bf..0bab1df3c 100644 --- a/actix-settings/Cargo.toml +++ b/actix-settings/Cargo.toml @@ -27,3 +27,6 @@ toml = "0.8" [dev-dependencies] actix-web = "4" env_logger = "0.11" + +[lints] +workspace = true diff --git a/actix-settings/src/lib.rs b/actix-settings/src/lib.rs index d837759af..d8dd9498a 100644 --- a/actix-settings/src/lib.rs +++ b/actix-settings/src/lib.rs @@ -61,8 +61,7 @@ //! ``` #![forbid(unsafe_code)] -#![deny(rust_2018_idioms, nonstandard_style)] -#![warn(future_incompatible, missing_docs, missing_debug_implementations)] +#![warn(missing_docs, missing_debug_implementations)] #![doc(html_logo_url = "https://actix.rs/img/logo.png")] #![doc(html_favicon_url = "https://actix.rs/favicon.ico")] #![cfg_attr(docsrs, feature(doc_auto_cfg))] diff --git a/actix-web-httpauth/Cargo.toml b/actix-web-httpauth/Cargo.toml index 7708fcbb4..09047645f 100644 --- a/actix-web-httpauth/Cargo.toml +++ b/actix-web-httpauth/Cargo.toml @@ -34,3 +34,6 @@ actix-service = "2" actix-web = { version = "4.1", default-features = false, features = ["macros"] } tracing-subscriber = { version = "0.3", features = ["env-filter"] } tracing = "0.1.30" + +[lints] +workspace = true diff --git a/actix-web-httpauth/src/lib.rs b/actix-web-httpauth/src/lib.rs index 56ee6962d..df923fec3 100644 --- a/actix-web-httpauth/src/lib.rs +++ b/actix-web-httpauth/src/lib.rs @@ -15,8 +15,7 @@ //! [Middleware]: self::middleware #![forbid(unsafe_code)] -#![deny(rust_2018_idioms, nonstandard_style)] -#![warn(future_incompatible, missing_docs)] +#![warn(missing_docs)] #![doc(html_logo_url = "https://actix.rs/img/logo.png")] #![doc(html_favicon_url = "https://actix.rs/favicon.ico")] #![cfg_attr(docsrs, feature(doc_auto_cfg))] diff --git a/actix-ws/Cargo.toml b/actix-ws/Cargo.toml index 537f75aa7..1d7f468da 100644 --- a/actix-ws/Cargo.toml +++ b/actix-ws/Cargo.toml @@ -28,3 +28,6 @@ pretty_env_logger = "0.5" tokio = { version = "1", features = ["sync", "rt", "macros"] } tracing = "0.1.30" tracing-subscriber = { version = "0.3", features = ["env-filter"] } + +[lints] +workspace = true diff --git a/actix-ws/src/lib.rs b/actix-ws/src/lib.rs index a33e226a5..2e78e7625 100644 --- a/actix-ws/src/lib.rs +++ b/actix-ws/src/lib.rs @@ -2,7 +2,6 @@ //! //! For usage, see documentation on [`handle()`]. -#![deny(rust_2018_idioms, nonstandard_style, future_incompatible)] #![warn(missing_docs)] #![doc(html_logo_url = "https://actix.rs/img/logo.png")] #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]