Fix lots of clippy lints

src/client_server/alias.rs

@@ -97,13 +97,12 @@ pub async fn get_alias_helper(
                     .map_or_else(Vec::new, |aliases| {
                         aliases
                             .iter()
-                            .map(|aliases| {
+                            .filter_map(|aliases| {
                                 aliases
                                     .get("regex")
                                     .and_then(|regex| regex.as_str())
                                     .and_then(|regex| Regex::new(regex).ok())
                             })
-                            .filter_map(|o| o)
                             .collect::<Vec<_>>()
                     });
 

src/client_server/directory.rs

@@ -135,9 +135,7 @@ pub async fn get_public_rooms_filtered_helper(
     filter: &IncomingFilter,
     _network: &IncomingRoomNetwork,
 ) -> ConduitResult<get_public_rooms_filtered::Response> {
-    if let Some(other_server) = server
-        .clone()
-        .filter(|server| *server != db.globals.server_name().as_str())
+    if let Some(other_server) = server.filter(|server| *server != db.globals.server_name().as_str())
     {
         let response = db
             .sending

src/client_server/membership.rs

@@ -743,12 +743,10 @@ pub async fn invite_helper(
         let create_event_content = create_event
             .as_ref()
             .map(|create_event| {
-                Ok::<_, Error>(
-                    serde_json::from_value::<Raw<CreateEventContent>>(create_event.content.clone())
-                        .expect("Raw::from_value always works.")
-                        .deserialize()
-                        .map_err(|_| Error::bad_database("Invalid PowerLevels event in db."))?,
-                )
+                serde_json::from_value::<Raw<CreateEventContent>>(create_event.content.clone())
+                    .expect("Raw::from_value always works.")
+                    .deserialize()
+                    .map_err(|_| Error::bad_database("Invalid PowerLevels event in db."))
             })
             .transpose()?;
 

src/client_server/session.rs

@@ -202,10 +202,8 @@ pub async fn logout_all_route(
 ) -> ConduitResult<logout_all::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
 
-    for device_id in db.users.all_device_ids(sender_user) {
-        if let Ok(device_id) = device_id {
-            db.users.remove_device(&sender_user, &device_id)?;
-        }
+    for device_id in db.users.all_device_ids(sender_user).flatten() {
+        db.users.remove_device(&sender_user, &device_id)?;
     }
 
     db.flush().await?;

src/client_server/sync.rs

@@ -146,11 +146,9 @@ pub async fn sync_events_route(
             let since_state = since_shortstatehash
                 .as_ref()
                 .map(|since_shortstatehash| {
-                    Ok::<_, Error>(
-                        since_shortstatehash
-                            .map(|since_shortstatehash| db.rooms.state_full(since_shortstatehash))
-                            .transpose()?,
-                    )
+                    since_shortstatehash
+                        .map(|since_shortstatehash| db.rooms.state_full(since_shortstatehash))
+                        .transpose()
                 })
                 .transpose()?;
 
@@ -255,7 +253,7 @@ pub async fn sync_events_route(
                 device_list_updates.extend(
                     db.rooms
                         .room_members(&room_id)
-                        .filter_map(|user_id| Some(user_id.ok()?))
+                        .flatten()
                         .filter(|user_id| {
                             // Don't send key updates from the sender to the sender
                             sender_user != user_id
@@ -313,9 +311,10 @@ pub async fn sync_events_route(
                                 Ok(None)
                             }
                         })
-                        .filter_map(|u| u.ok()) // Filter out buggy users
+                        // Filter out buggy users
+                        .filter_map(|u| u.ok())
                         // Filter for possible heroes
-                        .filter_map(|u| u)
+                        .flatten()
                     {
                         if heroes.contains(&hero) || hero == sender_user.as_str() {
                             continue;