From 79ee7838e77d56fecb09d62ca1fbdcdcaf0fc5f3 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Mon, 7 Jul 2025 02:21:17 +0000
Subject: [PATCH] Rename elided_named_lifetimes to
 mismatched_lifetime_syntaxes.

Reapply is_multiple_of().

Signed-off-by: Jason Volk <jason@zemos.net>
---
 Cargo.toml                                | 5 +++++
 src/service/rooms/state_compressor/mod.rs | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3afb8f9d..d5b1b635 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -856,6 +856,7 @@ unused-qualifications = "warn"
 
 ## some sadness
 elided_named_lifetimes = "allow"                                     # TODO!
+mismatched_lifetime_syntaxes = "allow"                               # TODO!
 let_underscore_drop = "allow"
 missing_docs = "allow"
 # cfgs cannot be limited to expected cfgs or their de facto non-transitive/opt-in use-case e.g.
@@ -871,6 +872,10 @@ variant_size_differences = "allow"
 # we check nightly clippy lints
 unknown_lints = "allow"
 
+# rust claims elided_named_lifetimes has been replaced by
+# mismatched_lifetime_syntaxes but it actually has not.
+renamed_and_removed_lints = "allow"
+
 #######################################
 #
 # Clippy lints
diff --git a/src/service/rooms/state_compressor/mod.rs b/src/service/rooms/state_compressor/mod.rs
index 2a10f929..6a5493ab 100644
--- a/src/service/rooms/state_compressor/mod.rs
+++ b/src/service/rooms/state_compressor/mod.rs
@@ -460,7 +460,6 @@ pub async fn save_state(
 }
 
 #[implement(Service)]
-#[allow(clippy::manual_is_multiple_of)]
 #[tracing::instrument(skip(self), level = "debug", name = "get")]
 async fn get_statediff(&self, shortstatehash: ShortStateHash) -> Result<StateDiff> {
 	const BUFSIZE: usize = size_of::<ShortStateHash>();
@@ -479,7 +478,7 @@ async fn get_statediff(&self, shortstatehash: ShortStateHash) -> Result<StateDif
 		.ok()
 		.take_if(|parent| *parent != 0);
 
-	debug_assert!(value.len() % STRIDE == 0, "value not aligned to stride");
+	debug_assert!(value.len().is_multiple_of(STRIDE), "value not aligned to stride");
 	let _num_values = value.len() / STRIDE;
 
 	let mut add_mode = true;