From bc0de9955c375cf27d52c9934403964205afc182 Mon Sep 17 00:00:00 2001 From: salmonik Date: Thu, 29 Oct 2026 22:16:15 +0100 Subject: formatting --- src/client/core.rs | 43 +++++++++++++------------------------------ src/client/database.rs | 7 +++---- src/client/games/blackjack.rs | 11 +++++------ src/client/games/manager.rs | 8 ++++---- src/client/games/response.rs | 4 ++-- src/client/games/roulette.rs | 12 ++---------- src/client/games/slots.rs | 6 +----- src/client/ui.rs | 13 +++---------- 8 files changed, 33 insertions(+), 71 deletions(-) (limited to 'src/client') diff --git a/src/client/core.rs b/src/client/core.rs index 5f8c513..06d9c42 100644 --- a/src/client/core.rs +++ b/src/client/core.rs @@ -3,8 +3,8 @@ use crate::client::games::response::{ parse_blackjack_response, parse_crash_response, parse_roulette_response, parse_spin_response, }; use crate::client::ui::{ - command_names, completion_lines, display_width, help_lines, input_cursor_column, - parse_bet_arg, record_history, + command_names, completion_lines, display_width, help_lines, input_cursor_column, parse_bet_arg, + record_history, }; use crate::crash::{multiplier_at, CrashState}; use crate::roulette::{Bets, NumberBet}; @@ -225,10 +225,7 @@ impl ClientCore { "Game exited. Active hand forfeited ({} PLN lost).", state.bet ); - vec![ - Effect::ClearRegion, - Effect::Print(vec![message]), - ] + vec![Effect::ClearRegion, Effect::Print(vec![message])] } Err(message) => { self.game.set_error(message); @@ -258,10 +255,7 @@ impl ClientCore { Ok(state) => { self.crash_started = None; self.game.end_game(); - let message = format!( - "Game exited. Round forfeited ({} PLN lost).", - state.bet - ); + let message = format!("Game exited. Round forfeited ({} PLN lost).", state.bet); vec![Effect::ClearRegion, Effect::Print(vec![message])] } Err(_) if self.game.crash_status() != "running" => { @@ -286,9 +280,7 @@ impl ClientCore { self.logged_in = None; vec![ Effect::Disconnect, - Effect::Print(vec![ - "Connection lost".to_string(), - ]), + Effect::Print(vec!["Connection lost".to_string()]), ] } } @@ -531,27 +523,20 @@ impl ClientCore { } } Key::Char(' ') => self.start_blackjack(), - Key::Char('h') - if hand.as_ref().is_some_and(|hand| hand.phase == "player") => - { + Key::Char('h') if hand.as_ref().is_some_and(|hand| hand.phase == "player") => { self.blackjack_action("hit") } - Key::Char('s') - if hand.as_ref().is_some_and(|hand| hand.phase == "player") => - { + Key::Char('s') if hand.as_ref().is_some_and(|hand| hand.phase == "player") => { self.blackjack_action("stand") } Key::Char('d') if hand.as_ref().is_some_and(|hand| { - hand.phase == "player" - && hand.actions.iter().any(|action| action == "double") + hand.phase == "player" && hand.actions.iter().any(|action| action == "double") }) => { self.blackjack_action("double") } - Key::Char('+') | Key::Char('=') - if matches!(status.as_str(), "ready" | "done") => - { + Key::Char('+') | Key::Char('=') if matches!(status.as_str(), "ready" | "done") => { let _ = self.game.adjust_bet(10); self.board_effects() } @@ -602,9 +587,7 @@ impl ClientCore { if hand.phase != "player" { return Vec::new(); } - if action == "double" - && !hand.actions.iter().any(|available| available == "double") - { + if action == "double" && !hand.actions.iter().any(|available| available == "double") { return Vec::new(); } self.pending = Some(Pending::BlackjackAction); @@ -914,9 +897,9 @@ impl ClientCore { Some(fingerprint) => { effects.push(Effect::Print(vec![format!("Fingerprint: {fingerprint}")])) } - None => effects.push(Effect::Print(vec![ - "Fingerprint: (not trusted)".to_string(), - ])), + None => effects.push(Effect::Print( + vec!["Fingerprint: (not trusted)".to_string()], + )), } self.pending = Some(Pending::Info); diff --git a/src/client/database.rs b/src/client/database.rs index e1fa42d..e1cedaf 100644 --- a/src/client/database.rs +++ b/src/client/database.rs @@ -110,9 +110,8 @@ pub fn get_all_hosts(conn: &Connection) -> Vec<(String, Option)> { let mut stmt = conn .prepare("SELECT host, fingerprint FROM hosts ORDER BY last_used DESC") .unwrap(); - let rows = stmt.query_map([], |row| { - Ok((row.get(0)?, row.get(1)?)) - }) - .unwrap(); + let rows = stmt + .query_map([], |row| Ok((row.get(0)?, row.get(1)?))) + .unwrap(); rows.filter_map(|r| r.ok()).collect() } diff --git a/src/client/games/blackjack.rs b/src/client/games/blackjack.rs index bad1781..d5f45b3 100644 --- a/src/client/games/blackjack.rs +++ b/src/client/games/blackjack.rs @@ -56,15 +56,14 @@ impl Game for BlackjackGame { .get("status") .map(String::as_str) .unwrap_or("ready"); - let balance = state - .data - .get("balance") - .map(String::as_str) - .unwrap_or("?"); + let balance = state.data.get("balance").map(String::as_str).unwrap_or("?"); let hand = Self::state(state); if let Some(error) = state.data.get("error") { - let bet = hand.as_ref().map(|hand| hand.bet).unwrap_or(state.bet_amount); + let bet = hand + .as_ref() + .map(|hand| hand.bet) + .unwrap_or(state.bet_amount); return format!( "=== BLACKJACK ===\r\nBalance: {balance} PLN Bet: {bet} PLN\r\n\r\n\r\nERROR: {error}\r\n[Q] Quit" ); diff --git a/src/client/games/manager.rs b/src/client/games/manager.rs index 4d9e6a8..b20ff44 100644 --- a/src/client/games/manager.rs +++ b/src/client/games/manager.rs @@ -138,9 +138,7 @@ impl GameManager { session.bet_amount = result.bet_amount; session.data.remove("error"); session.data.insert("reels".to_string(), result.reels); - session - .data - .insert("win_type".to_string(), result.win_type); + session.data.insert("win_type".to_string(), result.win_type); session.data.insert( "win_lines".to_string(), result @@ -339,7 +337,9 @@ impl GameManager { for key in ["crash_point", "payout"] { session.data.remove(key); } - session.data.insert("status".to_string(), state.phase.clone()); + session + .data + .insert("status".to_string(), state.phase.clone()); session .data .insert("session_id".to_string(), state.session_id); diff --git a/src/client/games/response.rs b/src/client/games/response.rs index 71e1fed..88df459 100644 --- a/src/client/games/response.rs +++ b/src/client/games/response.rs @@ -128,8 +128,8 @@ pub fn parse_roulette_response(response: &str) -> Result return Err(format!("Invalid roulette color: {color}")); } let bets = parts[7].to_string(); - let _: crate::roulette::Bets = serde_json::from_str(&bets) - .map_err(|error| format!("Invalid roulette bets: {error}"))?; + let _: crate::roulette::Bets = + serde_json::from_str(&bets).map_err(|error| format!("Invalid roulette bets: {error}"))?; Ok(RouletteResult { session_id: parts[1].to_string(), diff --git a/src/client/games/roulette.rs b/src/client/games/roulette.rs index 3379317..e80eca8 100644 --- a/src/client/games/roulette.rs +++ b/src/client/games/roulette.rs @@ -53,11 +53,7 @@ impl RouletteGame { match state.data.get("status").map(String::as_str) { Some("result") => { - let number = state - .data - .get("number") - .map(String::as_str) - .unwrap_or("?"); + let number = state.data.get("number").map(String::as_str).unwrap_or("?"); let color = state .data .get("color") @@ -102,11 +98,7 @@ impl Game for RouletteGame { fn render(&self, state: &GameState) -> String { let bets = Self::bets(state); let chip = state.data.get("chip").map(String::as_str).unwrap_or("10"); - let balance = state - .data - .get("balance") - .map(String::as_str) - .unwrap_or("?"); + let balance = state.data.get("balance").map(String::as_str).unwrap_or("?"); let input = state .data .get("number_input") diff --git a/src/client/games/slots.rs b/src/client/games/slots.rs index d34bf49..2ec354e 100644 --- a/src/client/games/slots.rs +++ b/src/client/games/slots.rs @@ -109,11 +109,7 @@ impl Game for SlotsGame { fn render(&self, state: &GameState) -> String { let reels = state.data.get("reels").cloned().unwrap_or_default(); - let balance = state - .data - .get("balance") - .map(String::as_str) - .unwrap_or("?"); + let balance = state.data.get("balance").map(String::as_str).unwrap_or("?"); let winning = Self::highlighted_cells(state); let grid = self.render_grid(&reels, &winning); let paytable = paytable_lines(); diff --git a/src/client/ui.rs b/src/client/ui.rs index 0fe78ae..4ab0759 100644 --- a/src/client/ui.rs +++ b/src/client/ui.rs @@ -94,10 +94,7 @@ pub fn command_names() -> Vec<&'static str> { pub fn help_lines() -> Vec { let mut lines = vec!["Available commands:".to_string()]; for command in COMMANDS { - lines.push(format!( - " {:<28} - {}", - command.usage, command.description - )); + lines.push(format!(" {:<28} - {}", command.usage, command.description)); } lines } @@ -291,16 +288,12 @@ pub fn host_lines(hosts: &[(String, Option)]) -> Vec { /// on the current line. `render()` has no trailing newline, so a 7-line board /// needs `MoveUp(6)`. pub fn lines_to_move_up(previous_lines: usize) -> u16 { - previous_lines - .saturating_sub(1) - .min(u16::MAX as usize) as u16 + previous_lines.saturating_sub(1).min(u16::MAX as usize) as u16 } /// Column (0-based) to move to after the given prompt and input text. pub fn input_cursor_column(prompt_len: usize, input_len: usize) -> u16 { - prompt_len - .saturating_add(input_len) - .min(u16::MAX as usize) as u16 + prompt_len.saturating_add(input_len).min(u16::MAX as usize) as u16 } /// Number of terminal rows a block of logical lines occupies after wrapping. -- cgit v1.2.3