enable redundant_closure_for_method_calls lint

src/service/pusher.rs

@@ -68,7 +68,7 @@ impl Service {
                 warn!("Failed to find destination {}: {}", destination, e);
                 Error::BadServerResponse("Invalid destination")
             })?
-            .map(|body| body.freeze());
+            .map(BytesMut::freeze);
 
         let reqwest_request = reqwest::Request::try_from(http_request)?;
 

src/service/rooms/event_handler.rs

@@ -434,9 +434,7 @@ impl Service {
 
             // The original create event must be in the auth events
             if !matches!(
-                auth_events
-                    .get(&(StateEventType::RoomCreate, String::new()))
-                    .map(|a| a.as_ref()),
+                auth_events.get(&(StateEventType::RoomCreate, String::new())),
                 Some(_) | None
             ) {
                 return Err(Error::BadRequest(
@@ -727,9 +725,7 @@ impl Service {
                         .get_shortstatekey(&StateEventType::RoomCreate, "")?
                         .expect("Room exists");
 
-                    if state.get(&create_shortstatekey).map(|id| id.as_ref())
-                        != Some(&create_event.event_id)
-                    {
+                    if state.get(&create_shortstatekey) != Some(&create_event.event_id) {
                         return Err(Error::bad_database(
                             "Incoming event refers to wrong create event.",
                         ));

src/service/rooms/pdu_metadata.rs

@@ -78,7 +78,7 @@ impl Service {
                         })
                     })
                     .take(limit)
-                    .filter_map(|r| r.ok()) // Filter out buggy events
+                    .filter_map(Result::ok) // Filter out buggy events
                     .filter(|(_, pdu)| {
                         services()
                             .rooms
@@ -125,7 +125,7 @@ impl Service {
                         })
                     })
                     .take(limit)
-                    .filter_map(|r| r.ok()) // Filter out buggy events
+                    .filter_map(Result::ok) // Filter out buggy events
                     .filter(|(_, pdu)| {
                         services()
                             .rooms

src/service/rooms/spaces.rs

@@ -63,13 +63,13 @@ impl Service {
         let mut results = Vec::new();
 
         while let Some(current_room) = {
-            while stack.last().map_or(false, |s| s.is_empty()) {
+            while stack.last().map_or(false, Vec::is_empty) {
                 stack.pop();
             }
             if stack.is_empty() {
                 None
             } else {
-                stack.last_mut().and_then(|s| s.pop())
+                stack.last_mut().and_then(Vec::pop)
             }
         } {
             rooms_in_path.push(current_room.clone());

src/service/rooms/state_accessor.rs

@@ -136,7 +136,7 @@ impl Service {
             .rooms
             .state_cache
             .room_members(room_id)
-            .filter_map(|r| r.ok())
+            .filter_map(Result::ok)
             .filter(|member| member.server_name() == origin);
 
         let visibility = match history_visibility {

src/service/rooms/timeline.rs

@@ -590,7 +590,7 @@ impl Service {
                     .rooms
                     .alias
                     .local_aliases_for_room(&pdu.room_id)
-                    .filter_map(|r| r.ok())
+                    .filter_map(Result::ok)
                     .any(|room_alias| aliases.is_match(room_alias.as_str()))
             };
 
@@ -838,7 +838,7 @@ impl Service {
                                 .rooms
                                 .state_cache
                                 .room_members(room_id)
-                                .filter_map(|m| m.ok())
+                                .filter_map(Result::ok)
                                 .filter(|m| m.server_name() == server_name)
                                 .filter(|m| m != target)
                                 .count();
@@ -864,7 +864,7 @@ impl Service {
                                 .rooms
                                 .state_cache
                                 .room_members(room_id)
-                                .filter_map(|m| m.ok())
+                                .filter_map(Result::ok)
                                 .filter(|m| m.server_name() == server_name)
                                 .filter(|m| m != target)
                                 .count();
@@ -965,7 +965,7 @@ impl Service {
             .rooms
             .state_cache
             .room_servers(room_id)
-            .filter_map(|r| r.ok())
+            .filter_map(Result::ok)
             .collect();
 
         // In case we are kicking or banning a user, we need to inform their server of the change

src/service/sending.rs

@@ -128,7 +128,7 @@ impl Service {
         // Retry requests we could not finish yet
         let mut initial_transactions = HashMap::<OutgoingKind, Vec<SendingEventType>>::new();
 
-        for (key, outgoing_kind, event) in self.db.active_requests().filter_map(|r| r.ok()) {
+        for (key, outgoing_kind, event) in self.db.active_requests().filter_map(Result::ok) {
             let entry = initial_transactions
                 .entry(outgoing_kind.clone())
                 .or_default();
@@ -158,7 +158,7 @@ impl Service {
                             self.db.delete_all_active_requests_for(&outgoing_kind)?;
 
                             // Find events that have been added since starting the last request
-                            let new_events = self.db.queued_requests(&outgoing_kind).filter_map(|r| r.ok()).take(30).collect::<Vec<_>>();
+                            let new_events = self.db.queued_requests(&outgoing_kind).filter_map(Result::ok).take(30).collect::<Vec<_>>();
 
                             if new_events.is_empty() {
                                 current_transaction_status.remove(&outgoing_kind);
@@ -244,7 +244,7 @@ impl Service {
             for (_, e) in self
                 .db
                 .active_requests_for(outgoing_kind)
-                .filter_map(|r| r.ok())
+                .filter_map(Result::ok)
             {
                 events.push(e);
             }
@@ -281,7 +281,7 @@ impl Service {
                 services()
                     .users
                     .keys_changed(room_id.as_ref(), since, None)
-                    .filter_map(|r| r.ok())
+                    .filter_map(Result::ok)
                     .filter(|user_id| user_id.server_name() == services().globals.server_name()),
             );