fix clippy hints

diff --git a/src/game/whist.rs b/src/game/whist.rs
index a04b90c4abb8fe4ba0cdc7d0ea424b80c771d7e5..e8807f84702bf39797d77bfa29b06aea4a7cd0ab 100644 (file)
--- a/src/game/whist.rs
+++ b/src/game/whist.rs
@@ -99,7 +99,7 @@ impl KnockOutWhist {
     }
 
     fn cards_by_player(&self) -> impl Iterator<Item = (Username, Card)> + '_ {
-        self.hands.iter().map(|(username, hand)| hand.iter().map(move |card| (*username, *card))).flatten()
+        self.hands.iter().flat_map(|(username, hand)| hand.iter().map(move |card| (*username, *card)))
     }
 
     fn all_hands_dealt(&self) -> bool {

diff --git a/src/pubsub.rs b/src/pubsub.rs
index 9235cf59bd31131f7af4c5cc3610c8f51f065717..3c8e6e5498f22084fb52885cec93aad3aa872b02 100644 (file)
--- a/src/pubsub.rs
+++ b/src/pubsub.rs
@@ -162,9 +162,9 @@ pub async fn handle_client_interest_subscriptions(
             }
             Action::RegisterInterest { index, mut client_interests } => {
                 debug!("Action::RegisterInterest{{ client_interests: {:?}, index: {:?} }}", client_interests, index);
-                let interests_prior: HashSet<ClientInterest> = clients.iter().map(|Client { ref interests, .. }| interests.clone()).flatten().collect();
+                let interests_prior: HashSet<ClientInterest> = clients.iter().flat_map(|Client { ref interests, .. }| interests.clone()).collect();
                 swap(&mut clients[index].interests, &mut client_interests);
-                let interests_after: HashSet<ClientInterest> = clients.iter().map(|Client { ref interests, .. }| interests.clone()).flatten().collect();
+                let interests_after: HashSet<ClientInterest> = clients.iter().flat_map(|Client { ref interests, .. }| interests.clone()).collect();
                 for interest in &interests_after - &interests_prior {
                     debug!("Subscribing to {:?}", interest);
                     if let Err(err) = connection.subscribe(interest).await {
@@ -207,9 +207,9 @@ pub async fn handle_client_interest_subscriptions(
             }
             Action::RemoveClient { index } => {
                 debug!("Action::RemoveClient {{ index: {:?} }}", index);
-                let interests_prior: HashSet<ClientInterest> = clients.iter().map(|Client { ref interests, .. }| interests.clone()).flatten().collect();
+                let interests_prior: HashSet<ClientInterest> = clients.iter().flat_map(|Client { ref interests, .. }| interests.clone()).collect();
                 clients.remove(index);
-                let interests_after: HashSet<ClientInterest> = clients.iter().map(|Client { ref interests, .. }| interests.clone()).flatten().collect();
+                let interests_after: HashSet<ClientInterest> = clients.iter().flat_map(|Client { ref interests, .. }| interests.clone()).collect();
                 for interest in &interests_prior - &interests_after {
                     debug!("Unsubscribing from {:?}", interest);
                     if let Err(err) = connection.unsubscribe(interest).await {