apply cargo fmt

diff --git a/src/config.rs b/src/config.rs
index ce44b72ddd90af5322ffd6ef8ac09f20264868e4..428d3d7b6b52cf7c29411514ce1e457337927250 100644 (file)
--- 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 24c5da986ccfa85f035b95917b7e8cb04679cdb1..f2f21545d0cf861ea949f7a84674cf56ad2e27f6 100644 (file)
--- 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 d970870d434981728ec59f7ef2916ecb7a85b64b..579afcc39d58ec043e5d3a192279d7bd23c4ddb3 100644 (file)
--- 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 80ee1ca48c99a72aa4fee0cfaa4935d47a06e79b..b2eaf1a252d28281d9cdf99b51a847fcdd652010 100644 (file)
--- 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<Response, tide::
 #[derive(Parser)]
 #[clap(version, author, about)]
 struct Args {
+    /// Path to configuration file in TOML format
     #[clap(short = 'c', long = "config")]
     config: Option<PathBuf>,
     #[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 0e0f358f93bc7688a974c576061424845babe460..9235cf59bd31131f7af4c5cc3610c8f51f065717 100644 (file)
--- 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<ClientInterestSender>) -> HandleClientInterestSubscriptionsError {
+pub async fn handle_client_interest_subscriptions(
+    mut connection: PubSub,
+    mut new_clients: Receiver<ClientInterestSender>,
+) -> HandleClientInterestSubscriptionsError {
     debug!("init");
     let mut clients: Vec<Client> = Vec::new();
     loop {