Remove unnecessary Option-wrapping and successive unwrapping

src/client_server/directory.rs

@@ -160,15 +160,12 @@ pub async fn get_public_rooms_filtered_helper(
                 .map(|c| {
                     // Convert ruma::api::federation::directory::get_public_rooms::v1::PublicRoomsChunk
                     // to ruma::api::client::r0::directory::PublicRoomsChunk
-                    Ok::<_, Error>(
                     serde_json::from_str(
                         &serde_json::to_string(&c)
                             .expect("PublicRoomsChunk::to_string always works"),
                     )
-                        .expect("federation and client-server PublicRoomsChunk are the same type"),
+                    .expect("federation and client-server PublicRoomsChunk are the same type")
-                    )
                 })
-                .filter_map(|r| r.ok())
                 .collect(),
             prev_batch: response.prev_batch,
             next_batch: response.next_batch,

src/database/rooms.rs

@@ -2023,10 +2023,7 @@ impl Rooms {
             .map(str::to_lowercase)
             .collect::<Vec<_>>();
 
-        let iterators = words
+        let iterators = words.clone().into_iter().map(move |word| {
-            .clone()
-            .into_iter()
-            .map(move |word| {
             let mut prefix2 = prefix.clone();
             prefix2.extend_from_slice(word.as_bytes());
             prefix2.push(0xff);
@@ -2034,7 +2031,6 @@ impl Rooms {
             let mut last_possible_id = prefix2.clone();
             last_possible_id.extend_from_slice(&u64::MAX.to_be_bytes());
 
-                Ok::<_, Error>(
             self.tokenids
                 .iter_from(&last_possible_id, true) // Newest pdus first
                 .take_while(move |(k, _)| k.starts_with(&prefix2))
@@ -2052,10 +2048,8 @@ impl Rooms {
 
                     Ok::<_, Error>(pdu_id)
                 })
-                        .filter_map(|r| r.ok()),
+                .filter_map(|r| r.ok())
-                )
+        });
-            })
-            .filter_map(|r| r.ok());
 
         Ok((
             utils::common_elements(iterators, |a, b| {

src/server_server.rs

@@ -532,15 +532,11 @@ pub async fn get_public_rooms_filtered_route(
             .map(|c| {
                 // Convert ruma::api::federation::directory::get_public_rooms::v1::PublicRoomsChunk
                 // to ruma::api::client::r0::directory::PublicRoomsChunk
-                Ok::<_, Error>(
                 serde_json::from_str(
-                        &serde_json::to_string(&c)
+                    &serde_json::to_string(&c).expect("PublicRoomsChunk::to_string always works"),
-                            .expect("PublicRoomsChunk::to_string always works"),
-                    )
-                    .expect("federation and client-server PublicRoomsChunk are the same type"),
                 )
+                .expect("federation and client-server PublicRoomsChunk are the same type")
             })
-            .filter_map(|r| r.ok())
             .collect(),
         prev_batch: response.prev_batch,
         next_batch: response.next_batch,
@@ -580,15 +576,11 @@ pub async fn get_public_rooms_route(
             .map(|c| {
                 // Convert ruma::api::federation::directory::get_public_rooms::v1::PublicRoomsChunk
                 // to ruma::api::client::r0::directory::PublicRoomsChunk
-                Ok::<_, Error>(
                 serde_json::from_str(
-                        &serde_json::to_string(&c)
+                    &serde_json::to_string(&c).expect("PublicRoomsChunk::to_string always works"),
-                            .expect("PublicRoomsChunk::to_string always works"),
-                    )
-                    .expect("federation and client-server PublicRoomsChunk are the same type"),
                 )
+                .expect("federation and client-server PublicRoomsChunk are the same type")
             })
-            .filter_map(|r| r.ok())
             .collect(),
         prev_batch: response.prev_batch,
         next_batch: response.next_batch,