From 8708cd3b633d88d260982563f2e2826bc8b12038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Wed, 5 Oct 2022 09:34:25 +0200
Subject: 431 errors left

---
 src/database/key_value/appservice.rs      | 6 +++---
 src/database/key_value/rooms/directory.rs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/database/key_value')

diff --git a/src/database/key_value/appservice.rs b/src/database/key_value/appservice.rs
index edb027e..f427ba7 100644
--- a/src/database/key_value/appservice.rs
+++ b/src/database/key_value/appservice.rs
@@ -54,11 +54,11 @@ impl service::appservice::Data for KeyValueDatabase {
             )
     }
 
-    fn iter_ids(&self) -> Result<Box<dyn Iterator<Item = Result<String>>>> {
-        Ok(self.id_appserviceregistrations.iter().map(|(id, _)| {
+    fn iter_ids<'a>(&'a self) -> Result<Box<dyn Iterator<Item = Result<String>> + 'a>> {
+        Ok(Box::new(self.id_appserviceregistrations.iter().map(|(id, _)| {
             utils::string_from_bytes(&id)
                 .map_err(|_| Error::bad_database("Invalid id bytes in id_appserviceregistrations."))
-        }))
+        })))
     }
 
     fn all(&self) -> Result<Vec<(String, serde_yaml::Value)>> {
diff --git a/src/database/key_value/rooms/directory.rs b/src/database/key_value/rooms/directory.rs
index c48afa9..727004e 100644
--- a/src/database/key_value/rooms/directory.rs
+++ b/src/database/key_value/rooms/directory.rs
@@ -16,13 +16,13 @@ impl service::rooms::directory::Data for KeyValueDatabase {
     }
 
     fn public_rooms(&self) -> Box<dyn Iterator<Item = Result<Box<RoomId>>>> {
-        self.publicroomids.iter().map(|(bytes, _)| {
+        Box::new(self.publicroomids.iter().map(|(bytes, _)| {
             RoomId::parse(
                 utils::string_from_bytes(&bytes).map_err(|_| {
                     Error::bad_database("Room ID in publicroomids is invalid unicode.")
                 })?,
             )
             .map_err(|_| Error::bad_database("Room ID in publicroomids is invalid."))
-        })
+        }))
     }
 }
-- 
cgit v1.2.3