From: Geoffrey Allott Date: Sun, 9 Jan 2022 21:51:20 +0000 (+0000) Subject: apply cargo fmt X-Git-Url: https://git.pointlesshacks.com/?a=commitdiff_plain;h=0cf3f9b8ee9e263caa7a44775976c2dbe51e11ac;p=pokerwave.git apply cargo fmt --- diff --git a/src/config.rs b/src/config.rs index ce44b72..428d3d7 100644 --- a/src/config.rs +++ b/src/config.rs @@ -50,10 +50,7 @@ pub struct RedisConfig { impl Default for RedisConfig { fn default() -> Self { - Self { - addr: default_redis_addr(), - connect_timeout_seconds: default_redis_connect_timeout_seconds(), - } + Self { addr: default_redis_addr(), connect_timeout_seconds: default_redis_connect_timeout_seconds() } } } diff --git a/src/game/cribbage/score.rs b/src/game/cribbage/score.rs index 24c5da9..f2f2154 100644 --- a/src/game/cribbage/score.rs +++ b/src/game/cribbage/score.rs @@ -2,8 +2,8 @@ use std::fmt::{self, Display}; use itertools::Itertools; -use crate::card::{Card, Rank}; use crate::card::Rank::*; +use crate::card::{Card, Rank}; #[derive(Copy, Clone, Debug)] pub struct Score { @@ -176,13 +176,8 @@ fn is_run(cards: &[Card]) -> bool { } pub fn score_pegging(cards: &[Card]) -> PeggingScore { - let mut score = PeggingScore { - fifteen: 0, - thirty_one: 0, - pair: 0, - run: 0, - }; - + let mut score = PeggingScore { fifteen: 0, thirty_one: 0, pair: 0, run: 0 }; + if sum_value(cards) == 15 { score.fifteen += 2; } @@ -217,13 +212,7 @@ pub fn score_pegging(cards: &[Card]) -> PeggingScore { } pub fn score_4_card_cribbage_hand(cards: [Card; 4], turnup: Card, is_box: bool) -> Score { - let mut score = Score { - nob: 0, - flush: 0, - fifteen: 0, - pair: 0, - run: 0, - }; + let mut score = Score { nob: 0, flush: 0, fifteen: 0, pair: 0, run: 0 }; for card in &cards { if card.rank == Jack && card.suit == turnup.suit { @@ -251,9 +240,7 @@ pub fn score_4_card_cribbage_hand(cards: [Card; 4], turnup: Card, is_box: bool) } for &run_length in &[5, 4, 3] { - let runs = cards.iter().cloned().combinations(run_length) - .filter(|cards| is_run(cards)) - .count(); + let runs = cards.iter().cloned().combinations(run_length).filter(|cards| is_run(cards)).count(); if runs > 0 { score.run += (run_length * runs) as u8; break; @@ -285,7 +272,10 @@ mod test { let score = score_4_card_cribbage_hand([FIVE_OF_CLUBS, FIVE_OF_DIAMONDS, FIVE_OF_HEARTS, JACK_OF_SPADES], TEN_OF_SPADES, false); assert_eq!(21, score.points()); - assert_eq!("Fifteen two, fifteen four, fifteen six, fifteen eight, fifteen ten, fifteen twelve, fifteen fourteen and six and one for his nob is 21", format!("{}", score)); + assert_eq!( + "Fifteen two, fifteen four, fifteen six, fifteen eight, fifteen ten, fifteen twelve, fifteen fourteen and six and one for his nob is 21", + format!("{}", score) + ); let score = score_4_card_cribbage_hand([SIX_OF_CLUBS, SEVEN_OF_DIAMONDS, EIGHT_OF_HEARTS, NINE_OF_SPADES], NINE_OF_CLUBS, false); assert_eq!(16, score.points()); diff --git a/src/game/poker/holdem.rs b/src/game/poker/holdem.rs index d970870..579afcc 100644 --- a/src/game/poker/holdem.rs +++ b/src/game/poker/holdem.rs @@ -1182,7 +1182,8 @@ mod tests { ]"#; let actions = serde_json::from_str(actions).unwrap(); - let settings = r#"{"format":"TexasHoldEm","title":"4-Player TexasHoldEm Test","max_players":4,"small_blind":25,"starting_stack":1000,"hide_cards":true}"#; + let settings = + r#"{"format":"TexasHoldEm","title":"4-Player TexasHoldEm Test","max_players":4,"small_blind":25,"starting_stack":1000,"hide_cards":true}"#; let settings = serde_json::from_str(settings).unwrap(); let seed = r#"{"rng":"ChaCha20","seed":"48e2f45eb4a1ac6bc4ab4f2368ba2d9b0d7c1f132d7fc7f51036e92112dae136"}"#; @@ -1242,7 +1243,8 @@ mod tests { ]"#; let actions = serde_json::from_str(actions).unwrap(); - let settings = r#"{"format":"TexasHoldEm","title":"4-Player TexasHoldEm Test","max_players":4,"small_blind":25,"starting_stack":1000,"hide_cards":true}"#; + let settings = + r#"{"format":"TexasHoldEm","title":"4-Player TexasHoldEm Test","max_players":4,"small_blind":25,"starting_stack":1000,"hide_cards":true}"#; let settings = serde_json::from_str(settings).unwrap(); let seed = r#"{"rng":"ChaCha20","seed":"48e2f45eb4a1ac6bc4ab4f2368ba2d9b0d7c1f132d7fc7f51036e92112dae136"}"#; @@ -1346,7 +1348,8 @@ mod tests { ]"#; let actions = serde_json::from_str(actions).unwrap(); - let settings = r#"{"format":"TexasHoldEm","title":"4-Player TexasHoldEm Test","max_players":4,"small_blind":25,"starting_stack":1000,"hide_cards":true}"#; + let settings = + r#"{"format":"TexasHoldEm","title":"4-Player TexasHoldEm Test","max_players":4,"small_blind":25,"starting_stack":1000,"hide_cards":true}"#; let settings = serde_json::from_str(settings).unwrap(); let seed = r#"{"rng":"ChaCha20","seed":"092b99f45313fff167029dc7420ed69a92becae492e09b65bc06ddcaae3c9e9c"}"#; @@ -1456,7 +1459,8 @@ mod tests { ]"#; let actions = serde_json::from_str(actions).unwrap(); - let settings = r#"{"format":"TexasHoldEm","title":"4-Player TexasHoldEm Test","max_players":4,"small_blind":25,"starting_stack":1000,"hide_cards":true}"#; + let settings = + r#"{"format":"TexasHoldEm","title":"4-Player TexasHoldEm Test","max_players":4,"small_blind":25,"starting_stack":1000,"hide_cards":true}"#; let settings = serde_json::from_str(settings).unwrap(); let seed = r#"{"rng":"ChaCha20","seed":"092b99f45313fff167029dc7420ed69a92becae492e09b65bc06ddcaae3c9e9c"}"#; @@ -1501,7 +1505,8 @@ mod tests { ]"#; let actions = serde_json::from_str(actions).unwrap(); - let settings = r#"{"format":"TexasHoldEm","title":"4-Player TexasHoldEm Test","max_players":4,"small_blind":25,"starting_stack":1000,"hide_cards":true}"#; + let settings = + r#"{"format":"TexasHoldEm","title":"4-Player TexasHoldEm Test","max_players":4,"small_blind":25,"starting_stack":1000,"hide_cards":true}"#; let settings = serde_json::from_str(settings).unwrap(); let seed = r#"{"rng":"ChaCha20","seed":"092b99f45313fff167029dc7420ed69a92becae492e09b65bc06ddcaae3c9e9c"}"#; diff --git a/src/main.rs b/src/main.rs index 80ee1ca..b2eaf1a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -45,7 +45,7 @@ mod util; use crate::client::new_client; use crate::config::Config; use crate::dealer::{spawn_dealers, Partition}; -use crate::pubsub::{HandleClientInterestSubscriptionsError, handle_client_interest_subscriptions}; +use crate::pubsub::{handle_client_interest_subscriptions, HandleClientInterestSubscriptionsError}; use crate::server::Server; async fn handle_signals(mut signals: Signals) { @@ -73,6 +73,7 @@ async fn append_cache_control(mut response: Response) -> Result, #[clap(subcommand)] @@ -133,7 +134,7 @@ async fn main() -> Result<(), tide::Error> { run_dealer = false; partition = Partition::default(); } - Some(Command::Dealer { partition: part}) => { + Some(Command::Dealer { partition: part }) => { run_server = false; run_dealer = true; partition = part; diff --git a/src/pubsub.rs b/src/pubsub.rs index 0e0f358..9235cf5 100644 --- a/src/pubsub.rs +++ b/src/pubsub.rs @@ -107,7 +107,10 @@ pub enum HandleClientInterestSubscriptionsError { RedisConnectionDropped, } -pub async fn handle_client_interest_subscriptions(mut connection: PubSub, mut new_clients: Receiver) -> HandleClientInterestSubscriptionsError { +pub async fn handle_client_interest_subscriptions( + mut connection: PubSub, + mut new_clients: Receiver, +) -> HandleClientInterestSubscriptionsError { debug!("init"); let mut clients: Vec = Vec::new(); loop {