From a78bf8f50be7440919c2ea6f196d74e807d60bdc Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Sun, 12 May 2024 14:54:48 -0700
Subject: [PATCH] enable `unused_lifetimes` lint

---
 Cargo.toml                             | 1 +
 src/api/client_server/membership.rs    | 2 +-
 src/database/abstraction/rocksdb.rs    | 4 ++--
 src/database/abstraction/sqlite.rs     | 4 ++--
 src/database/key_value/rooms/search.rs | 2 +-
 src/database/key_value/rooms/state.rs  | 2 +-
 src/service/rooms/search.rs            | 2 +-
 src/service/rooms/timeline.rs          | 4 ++--
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 37d4d7ff..e25bc864 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,6 +11,7 @@ unreachable_pub = "warn"
 unsafe_op_in_unsafe_fn = "warn"
 unused_extern_crates = "warn"
 unused_import_braces = "warn"
+unused_lifetimes = "warn"
 unused_macro_rules = "warn"
 unused_qualifications = "warn"
 
diff --git a/src/api/client_server/membership.rs b/src/api/client_server/membership.rs
index bc98c00b..dbaa69a2 100644
--- a/src/api/client_server/membership.rs
+++ b/src/api/client_server/membership.rs
@@ -1206,7 +1206,7 @@ async fn validate_and_add_event_id(
     Ok((event_id, value))
 }
 
-pub(crate) async fn invite_helper<'a>(
+pub(crate) async fn invite_helper(
     sender_user: &UserId,
     user_id: &UserId,
     room_id: &RoomId,
diff --git a/src/database/abstraction/rocksdb.rs b/src/database/abstraction/rocksdb.rs
index 78e76524..9fd24e1e 100644
--- a/src/database/abstraction/rocksdb.rs
+++ b/src/database/abstraction/rocksdb.rs
@@ -156,7 +156,7 @@ impl KvTree for RocksDbEngineTree<'_> {
         Ok(())
     }
 
-    fn insert_batch<'a>(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
+    fn insert_batch(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
         let writeoptions = rocksdb::WriteOptions::default();
         for (key, value) in iter {
             self.db
@@ -230,7 +230,7 @@ impl KvTree for RocksDbEngineTree<'_> {
         Ok(new)
     }
 
-    fn increment_batch<'a>(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
+    fn increment_batch(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
         let readoptions = rocksdb::ReadOptions::default();
         let writeoptions = rocksdb::WriteOptions::default();
 
diff --git a/src/database/abstraction/sqlite.rs b/src/database/abstraction/sqlite.rs
index a5bfe540..8e7d3f56 100644
--- a/src/database/abstraction/sqlite.rs
+++ b/src/database/abstraction/sqlite.rs
@@ -197,7 +197,7 @@ impl KvTree for SqliteTable {
         Ok(())
     }
 
-    fn insert_batch<'a>(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
+    fn insert_batch(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
         let guard = self.engine.write_lock();
 
         guard.execute("BEGIN", [])?;
@@ -211,7 +211,7 @@ impl KvTree for SqliteTable {
         Ok(())
     }
 
-    fn increment_batch<'a>(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
+    fn increment_batch(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
         let guard = self.engine.write_lock();
 
         guard.execute("BEGIN", [])?;
diff --git a/src/database/key_value/rooms/search.rs b/src/database/key_value/rooms/search.rs
index ad573f06..652c508c 100644
--- a/src/database/key_value/rooms/search.rs
+++ b/src/database/key_value/rooms/search.rs
@@ -3,7 +3,7 @@ use ruma::RoomId;
 use crate::{database::KeyValueDatabase, service, services, utils, Result};
 
 impl service::rooms::search::Data for KeyValueDatabase {
-    fn index_pdu<'a>(&self, shortroomid: u64, pdu_id: &[u8], message_body: &str) -> Result<()> {
+    fn index_pdu(&self, shortroomid: u64, pdu_id: &[u8], message_body: &str) -> Result<()> {
         let mut batch = message_body
             .split_terminator(|c: char| !c.is_alphanumeric())
             .filter(|s| !s.is_empty())
diff --git a/src/database/key_value/rooms/state.rs b/src/database/key_value/rooms/state.rs
index f17d37bb..6865d7b9 100644
--- a/src/database/key_value/rooms/state.rs
+++ b/src/database/key_value/rooms/state.rs
@@ -49,7 +49,7 @@ impl service::rooms::state::Data for KeyValueDatabase {
             .collect()
     }
 
-    fn set_forward_extremities<'a>(
+    fn set_forward_extremities(
         &self,
         room_id: &RoomId,
         event_ids: Vec<OwnedEventId>,
diff --git a/src/service/rooms/search.rs b/src/service/rooms/search.rs
index 48dacca2..8f2ae8aa 100644
--- a/src/service/rooms/search.rs
+++ b/src/service/rooms/search.rs
@@ -11,7 +11,7 @@ pub(crate) struct Service {
 
 impl Service {
     #[tracing::instrument(skip(self))]
-    pub(crate) fn index_pdu<'a>(
+    pub(crate) fn index_pdu(
         &self,
         shortroomid: u64,
         pdu_id: &[u8],
diff --git a/src/service/rooms/timeline.rs b/src/service/rooms/timeline.rs
index 74f48935..307b5f97 100644
--- a/src/service/rooms/timeline.rs
+++ b/src/service/rooms/timeline.rs
@@ -199,7 +199,7 @@ impl Service {
     ///
     /// Returns pdu id
     #[tracing::instrument(skip(self, pdu, pdu_json, leaves))]
-    pub(crate) async fn append_pdu<'a>(
+    pub(crate) async fn append_pdu(
         &self,
         pdu: &PduEvent,
         mut pdu_json: CanonicalJsonObject,
@@ -1007,7 +1007,7 @@ impl Service {
     /// Append the incoming event setting the state snapshot to the state from the
     /// server that sent the event.
     #[tracing::instrument(skip_all)]
-    pub(crate) async fn append_incoming_pdu<'a>(
+    pub(crate) async fn append_incoming_pdu(
         &self,
         pdu: &PduEvent,
         pdu_json: CanonicalJsonObject,