From 19e8d1ad19f7f75772efb688c0960fa6f4cbdecf Mon Sep 17 00:00:00 2001 From: Geoffrey Allott Date: Wed, 31 Mar 2021 17:38:55 +0100 Subject: [PATCH] apply rustfmt --- src/game/mod.rs | 7 +------ src/game/poker/holdem.rs | 40 +++++++++++++++++++--------------------- src/game/whist.rs | 38 ++++++++++++++++++-------------------- src/main.rs | 5 ++++- 4 files changed, 42 insertions(+), 48 deletions(-) diff --git a/src/game/mod.rs b/src/game/mod.rs index cc3e6db..8ec8795 100644 --- 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 8fa1c62..5069844 100644 --- 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 { 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 a817941..a04b90c 100644 --- 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 936359e..559a46b 100644 --- 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, }; -- 2.34.1