apply rustfmt

diff --git a/src/game/mod.rs b/src/game/mod.rs
index cc3e6db638dbe0d2dd6d9316194dd914dc60822a..8ec8795652bb89bcdef9f8ac47920ba7256ddf2e 100644 (file)
--- a/src/game/mod.rs
+++ b/src/game/mod.rs
@@ -110,12 +110,7 @@ pub struct GameStatus {
 
 impl GameStatus {
     pub fn new(created: Timestamp) -> Self {
-        Self {
-            created,
-            completed: false,
-            players: HashSet::new(),
-            winner: None,
-        }
+        Self { created, completed: false, players: HashSet::new(), winner: None }
     }
 }
 

diff --git a/src/game/poker/holdem.rs b/src/game/poker/holdem.rs
index 8fa1c6296e5c2fa81d554916e7899ff88ce68c2f..5069844062f1795283e19a79cfb03e64266c89b2 100644 (file)
--- a/src/game/poker/holdem.rs
+++ b/src/game/poker/holdem.rs
@@ -269,7 +269,7 @@ impl Game for TexasHoldEm {
     fn validate_action(&self, UserAction { timestamp, username, action }: UserAction) -> Result<ValidatedUserAction, ActionError> {
         match (self.state, action) {
             (_, Action::PlayCard { .. }) | (_, Action::ChooseTrumps { .. }) => Err(ActionError::InvalidActionForGameType),
-            (_, Action::Message {message}) => Ok(ValidatedUserAction(UserAction { timestamp, username, action: Action::Message {message}})),
+            (_, Action::Message { message }) => Ok(ValidatedUserAction(UserAction { timestamp, username, action: Action::Message { message } })),
             (State::NotStarted, Action::Join { seat, chips }) => {
                 if self.seats.contains_player(username) {
                     Err(ActionError::AlreadyJoined)
@@ -316,7 +316,7 @@ impl Game for TexasHoldEm {
 
     fn take_action(&mut self, ValidatedUserAction(UserAction { timestamp, username, action }): ValidatedUserAction) -> Result<(), ActionError> {
         self.actions_len += 1;
-        if matches!(action, Action::Message {..}) {
+        if matches!(action, Action::Message { .. }) {
             return Ok(());
         }
         self.last_action_time = Some(timestamp);
@@ -485,29 +485,27 @@ impl Game for TexasHoldEm {
     fn next_dealer_action(&self, timestamp: Timestamp) -> DealerAction {
         let mut rng = self.rng.clone();
         match self.state {
-            State::NotStarted => {
-                match self.settings.start_time {
-                    StartCondition::WhenFull => {
-                        if self.seats.players_len() == self.settings.max_players as usize {
-                            if let Some(username) = rng.choose_from(self.seats.player_set()) {
-                                return DealerAction::TakeAction(ValidatedUserAction(UserAction { timestamp, username, action: Action::NextToDeal }));
-                            }
+            State::NotStarted => match self.settings.start_time {
+                StartCondition::WhenFull => {
+                    if self.seats.players_len() == self.settings.max_players as usize {
+                        if let Some(username) = rng.choose_from(self.seats.player_set()) {
+                            return DealerAction::TakeAction(ValidatedUserAction(UserAction { timestamp, username, action: Action::NextToDeal }));
                         }
-                        DealerAction::WaitForPlayer
                     }
-                    StartCondition::AtTime(start_time) => {
-                        if timestamp >= start_time {
-                            if self.seats.players_len() < 2 {
-                                return DealerAction::WaitForPlayer
-                            }
-                            if let Some(username) = rng.choose_from(self.seats.player_set()) {
-                                return DealerAction::TakeAction(ValidatedUserAction(UserAction { timestamp, username, action: Action::NextToDeal }));
-                            }
+                    DealerAction::WaitForPlayer
+                }
+                StartCondition::AtTime(start_time) => {
+                    if timestamp >= start_time {
+                        if self.seats.players_len() < 2 {
+                            return DealerAction::WaitForPlayer;
+                        }
+                        if let Some(username) = rng.choose_from(self.seats.player_set()) {
+                            return DealerAction::TakeAction(ValidatedUserAction(UserAction { timestamp, username, action: Action::NextToDeal }));
                         }
-                        DealerAction::WaitUntil(start_time)
                     }
+                    DealerAction::WaitUntil(start_time)
                 }
-            }
+            },
             State::Dealing => {
                 if let Some(username) = self.receiver {
                     let card = rng.choose_from(&self.deck).cloned();
@@ -619,7 +617,7 @@ impl Game for TexasHoldEm {
                 } else if let Some(username) = self.only_player_left() {
                     DealerAction::TakeAction(ValidatedUserAction(UserAction { timestamp, username, action: Action::WinGame }))
                 } else if let Some(username) = self.dealer.and_then(|dealer| self.seats.player_after(dealer)) {
-                        let level = self.start_time.map(|start_time| self.settings.level(timestamp.millis_since(start_time))).unwrap_or(self.level);
+                    let level = self.start_time.map(|start_time| self.settings.level(timestamp.millis_since(start_time))).unwrap_or(self.level);
                     if level > self.level {
                         DealerAction::TakeAction(ValidatedUserAction(UserAction {
                             timestamp,

diff --git a/src/game/whist.rs b/src/game/whist.rs
index a817941842a0bfff8364abfb93e7c1238c7f1a4c..a04b90c4abb8fe4ba0cdc7d0ea424b80c771d7e5 100644 (file)
--- a/src/game/whist.rs
+++ b/src/game/whist.rs
@@ -125,7 +125,7 @@ impl Game for KnockOutWhist {
             (_, Action::AddOn { .. }) | (_, Action::RevealCard { .. }) | (_, Action::Fold) | (_, Action::TimeoutFold) | (_, Action::Bet { .. }) => {
                 Err(ActionError::InvalidActionForGameType)
             }
-            (_, Action::Message {message}) => Ok(ValidatedUserAction(UserAction { timestamp, username, action: Action::Message {message}})),
+            (_, Action::Message { message }) => Ok(ValidatedUserAction(UserAction { timestamp, username, action: Action::Message { message } })),
             (State::NotStarted, Action::Join { seat, .. }) => {
                 if self.seats.contains_player(username) {
                     Err(ActionError::AlreadyJoined)
@@ -172,7 +172,7 @@ impl Game for KnockOutWhist {
 
     fn take_action(&mut self, ValidatedUserAction(UserAction { username, action, .. }): ValidatedUserAction) -> Result<(), ActionError> {
         self.actions_len += 1;
-        if matches!(action, Action::Message {..}) {
+        if matches!(action, Action::Message { .. }) {
             return Ok(());
         }
         self.rng.advance();
@@ -310,29 +310,27 @@ impl Game for KnockOutWhist {
     fn next_dealer_action(&self, timestamp: Timestamp) -> DealerAction {
         let mut rng = self.rng.clone();
         match self.state {
-            State::NotStarted => {
-                match self.settings.start_time {
-                    StartCondition::WhenFull => {
-                        if self.seats.players_len() == self.settings.max_players as usize {
-                            if let Some(username) = rng.choose_from(self.seats.player_set()) {
-                                return DealerAction::TakeAction(ValidatedUserAction(UserAction { timestamp, username, action: Action::NextToDeal }));
-                            }
+            State::NotStarted => match self.settings.start_time {
+                StartCondition::WhenFull => {
+                    if self.seats.players_len() == self.settings.max_players as usize {
+                        if let Some(username) = rng.choose_from(self.seats.player_set()) {
+                            return DealerAction::TakeAction(ValidatedUserAction(UserAction { timestamp, username, action: Action::NextToDeal }));
                         }
-                        DealerAction::WaitForPlayer
                     }
-                    StartCondition::AtTime(start_time) => {
-                        if timestamp >= start_time {
-                            if self.seats.players_len() < 2 {
-                                return DealerAction::WaitForPlayer
-                            }
-                            if let Some(username) = rng.choose_from(self.seats.player_set()) {
-                                return DealerAction::TakeAction(ValidatedUserAction(UserAction { timestamp, username, action: Action::NextToDeal }));
-                            }
+                    DealerAction::WaitForPlayer
+                }
+                StartCondition::AtTime(start_time) => {
+                    if timestamp >= start_time {
+                        if self.seats.players_len() < 2 {
+                            return DealerAction::WaitForPlayer;
+                        }
+                        if let Some(username) = rng.choose_from(self.seats.player_set()) {
+                            return DealerAction::TakeAction(ValidatedUserAction(UserAction { timestamp, username, action: Action::NextToDeal }));
                         }
-                        DealerAction::WaitUntil(start_time)
                     }
+                    DealerAction::WaitUntil(start_time)
                 }
-            }
+            },
             State::Dealing => {
                 if let Some(username) = self.receiver {
                     let card = rng.choose_from(&self.deck).cloned();

diff --git a/src/main.rs b/src/main.rs
index 936359e8e42c1602cb1711ce76dfc706a256a885..559a46b8e12c650be1662d0f8038f27b2fc0fb95 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -16,8 +16,11 @@ use redis::Client;
 use signal_hook::consts::signal::*;
 use signal_hook_async_std::Signals;
 use tide::{
+    http::{
+        cache::{CacheControl, CacheDirective},
+        headers::CACHE_CONTROL,
+    },
     listener::{ConcurrentListener, ToListener},
-    http::{cache::{CacheControl, CacheDirective}, headers::CACHE_CONTROL},
     utils::After,
     Body, Response, StatusCode,
 };