Merge branch 'main' into dependabot/cargo/rustls-pemfile-2.1

gotham-rs · Mar 5, 2024 · b8c69b6 · b8c69b6
2 parents f4e6e9f + 6a2b527
commit b8c69b6
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 19 deletions.
diff --git a/examples/handlers/stateful/src/main.rs b/examples/handlers/stateful/src/main.rs
@@ -1,6 +1,6 @@
 //! An example of using stateful handlers with the Gotahm web framework.
 
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::mutex_atomic))]
+#![allow(clippy::mutex_atomic)]
 
 use futures_util::future::{self, FutureExt};
 use std::pin::Pin;

diff --git a/examples/shared_state/src/main.rs b/examples/shared_state/src/main.rs
@@ -4,7 +4,7 @@
 //! used across server threads, and be used to track the number of
 //! requests sent to the backend.
 
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::mutex_atomic))]
+#![allow(clippy::mutex_atomic)]
 
 use gotham::middleware::state::StateMiddleware;
 use gotham::pipeline::{single_middleware, single_pipeline};

diff --git a/examples/websocket/Cargo.toml b/examples/websocket/Cargo.toml
@@ -13,4 +13,4 @@ tokio-tungstenite = "0.21"
 tokio = "1.11.0"
 pretty_env_logger = "0.5"
 sha1 = "0.10"
-base64 = "0.21"
+base64 = "0.22"
diff --git a/gotham/Cargo.toml b/gotham/Cargo.toml
@@ -30,7 +30,7 @@ borrow-bag = { path = "../misc/borrow_bag", version = "1.1.1" }
 gotham_derive = { path = "../gotham_derive", version = "0.7.1", optional = true }
 
 anyhow = "1.0.5"
-base64 = "0.21"
+base64 = "0.22"
 bincode = { version = "1.0", optional = true }
 bytes = "1.0"
 cookie = "0.15"

diff --git a/gotham/src/lib.rs b/gotham/src/lib.rs
@@ -7,19 +7,16 @@
 #![warn(deprecated, missing_docs, unreachable_pub)]
 // Stricter requirements once we get to pull request stage, all warnings must be resolved.
 #![cfg_attr(feature = "ci", deny(warnings))]
-#![cfg_attr(
-    feature = "cargo-clippy",
-    allow(
-        clippy::needless_lifetimes,
-        clippy::should_implement_trait,
-        clippy::unit_arg,
-        clippy::match_wild_err_arm,
-        clippy::new_without_default,
-        clippy::wrong_self_convention,
-        clippy::mutex_atomic,
-        clippy::borrowed_box,
-        clippy::get_unwrap,
-    )
+#![allow(
+    clippy::needless_lifetimes,
+    clippy::should_implement_trait,
+    clippy::unit_arg,
+    clippy::match_wild_err_arm,
+    clippy::new_without_default,
+    clippy::wrong_self_convention,
+    clippy::mutex_atomic,
+    clippy::borrowed_box,
+    clippy::get_unwrap
 )]
 #![doc(test(no_crate_inject, attr(deny(warnings))))]
 // TODO: Remove this when it's a hard error by default (error E0446).

diff --git a/middleware/jwt/src/middleware.rs b/middleware/jwt/src/middleware.rs
@@ -196,7 +196,7 @@ mod tests {
         exp: usize,
     }
 
-    #[cfg_attr(feature = "cargo-clippy", allow(clippy::match_wild_err_arm))]
+    #[allow(clippy::match_wild_err_arm)]
     fn token(alg: Algorithm) -> String {
         let claims = &Claims {
             sub: "test@example.net".to_owned(),

diff --git a/misc/borrow_bag/src/lib.rs b/misc/borrow_bag/src/lib.rs
@@ -8,7 +8,7 @@
 #![warn(missing_docs, deprecated)]
 // Stricter requirements once we get to pull request stage, all warnings must be resolved.
 #![cfg_attr(feature = "ci", deny(warnings))]
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::should_implement_trait))]
+#![allow(clippy::should_implement_trait)]
 #![doc(test(attr(deny(warnings))))]
 // TODO: Remove this when it's a hard error by default (error E0446).
 // See Rust issue #34537 <https://github.com/rust-lang/rust/issues/34537>