From: Geoffrey Allott <geoffrey@allott.email>
Date: Wed, 20 Jul 2022 20:02:26 +0000 (+0100)
Subject: fix clippy hints
X-Git-Url: https://git.pointlesshacks.com/?a=commitdiff_plain;h=c47da4c902b0f8a8d14a3b18bdfd70ebdf2050d1;p=pokerwave.git

fix clippy hints
---

diff --git a/src/game/whist.rs b/src/game/whist.rs
index a04b90c..e8807f8 100644
--- 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 9235cf5..3c8e6e5 100644
--- 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 {