diff --git a/src/admin/mod.rs b/src/admin/mod.rs index 6c765f4b..2e969411 100644 --- a/src/admin/mod.rs +++ b/src/admin/mod.rs @@ -1,4 +1,3 @@ -#![expect(clippy::enum_glob_use)] #![expect(clippy::too_many_arguments)] pub(crate) mod admin; diff --git a/src/core/benches/state_res.rs b/src/core/benches/state_res.rs index 0a9bcbca..8599e489 100644 --- a/src/core/benches/state_res.rs +++ b/src/core/benches/state_res.rs @@ -278,7 +278,6 @@ impl TestStore { } impl TestStore { - #[expect(clippy::type_complexity)] fn set_up( &mut self, ) -> (StateMap, StateMap, StateMap) { diff --git a/src/core/matrix/state_res/resolve/tests.rs b/src/core/matrix/state_res/resolve/tests.rs index 58fedb1e..88b32769 100644 --- a/src/core/matrix/state_res/resolve/tests.rs +++ b/src/core/matrix/state_res/resolve/tests.rs @@ -726,7 +726,6 @@ fn JOIN_RULE() -> HashMap { macro_rules! state_set { ($($kind:expr => $key:expr => $id:expr),* $(,)?) => {{ - #[expect(unused_mut)] let mut x = StateMap::new(); $( x.insert(($kind, $key.into()), $id); diff --git a/src/core/matrix/state_res/test_utils.rs b/src/core/matrix/state_res/test_utils.rs index 0f96cf80..104ee551 100644 --- a/src/core/matrix/state_res/test_utils.rs +++ b/src/core/matrix/state_res/test_utils.rs @@ -248,7 +248,6 @@ pub(super) async fn do_check( assert_eq!(expected_state, end_state); } -#[expect(clippy::exhaustive_structs)] pub(super) struct TestStore(pub(super) HashMap); impl TestStore { @@ -286,7 +285,6 @@ impl TestStore { } // A StateStore implementation for testing -#[expect(clippy::type_complexity)] impl TestStore { pub(super) fn set_up( &mut self, diff --git a/src/core/utils/tests.rs b/src/core/utils/tests.rs index 4479d08b..98f706f8 100644 --- a/src/core/utils/tests.rs +++ b/src/core/utils/tests.rs @@ -1,5 +1,3 @@ -#![expect(clippy::disallowed_methods)] - use crate::utils; #[test] @@ -109,7 +107,6 @@ async fn mutex_map_contend() { } #[test] -#[expect(clippy::iter_on_single_items, clippy::many_single_char_names)] fn set_intersection_none() { use utils::set::intersection; diff --git a/src/router/request.rs b/src/router/request.rs index b0bb4605..95a9dcb5 100644 --- a/src/router/request.rs +++ b/src/router/request.rs @@ -73,6 +73,7 @@ pub(crate) async fn handle( skip_all, ret(level = "trace"), )] +#[cfg_attr(not(debug_assertions), expect(unused_variables))] async fn execute( // we made a safety contract that Services will not go out of scope // during the request; this ensures a reference is accounted for at diff --git a/src/service/admin/execute.rs b/src/service/admin/execute.rs index b8aacd30..a46c53d7 100644 --- a/src/service/admin/execute.rs +++ b/src/service/admin/execute.rs @@ -6,7 +6,7 @@ pub(super) const SIGNAL: &str = "SIGUSR2"; /// Possibly spawn the terminal console at startup if configured. #[implement(super::Service)] -#[expect(clippy::unused_async)] +#[cfg_attr(not(feature = "console"), expect(clippy::unused_async))] pub(super) async fn console_auto_start(&self) { #[cfg(feature = "console")] if self @@ -23,7 +23,7 @@ pub(super) async fn console_auto_start(&self) { /// Shutdown the console when the admin worker terminates. #[implement(super::Service)] -#[expect(clippy::unused_async)] +#[cfg_attr(not(feature = "console"), expect(clippy::unused_async))] pub(super) async fn console_auto_stop(&self) { #[cfg(feature = "console")] self.console.close().await; diff --git a/src/service/manager.rs b/src/service/manager.rs index c5c9b911..32e09ac6 100644 --- a/src/service/manager.rs +++ b/src/service/manager.rs @@ -88,6 +88,7 @@ impl Manager { Ok(()) } + #[allow(clippy::unused_self)] fn handle_abort(&self, _workers: &mut WorkersLocked<'_>, error: &Error) -> Result { // not supported until service can be associated with abort unimplemented!("unexpected worker task abort {error:?}"); diff --git a/src/service/uiaa/mod.rs b/src/service/uiaa/mod.rs index a4fb795d..c28bd587 100644 --- a/src/service/uiaa/mod.rs +++ b/src/service/uiaa/mod.rs @@ -67,7 +67,7 @@ pub fn create( } #[implement(Service)] -#[expect(clippy::useless_let_if_seq)] +#[allow(clippy::useless_let_if_seq)] pub async fn try_auth( &self, user_id: &UserId,