formatting

5 files changed, 22 insertions, 38 deletions

diff --git a/src/bin/client/repl.rs b/src/bin/client/repl.rs
index 7fa462a..9af4ea9 100644
--- a/src/bin/client/repl.rs
+++ b/src/bin/client/repl.rs
@@ -1,14 +1,14 @@
 use rusqlite::Connection;
-use std::io::{stdout, Write};
+use std::io::{Write, stdout};
 use std::sync::{Arc, Mutex};
 use std::time::Instant;
 
 use crossterm::{
     cursor::{MoveToColumn, MoveUp, Show},
-    event::{read, Event, KeyCode, KeyEventKind, KeyModifiers},
+    event::{Event, KeyCode, KeyEventKind, KeyModifiers, read},
     execute,
     style::Stylize,
-    terminal::{disable_raw_mode, enable_raw_mode, Clear, ClearType},
+    terminal::{Clear, ClearType, disable_raw_mode, enable_raw_mode},
 };
 
 use sha2::{Digest, Sha256};
@@ -20,7 +20,7 @@ use zagan_bet::client::ui::{
     visual_line_count,
 };
 use zagan_bet::protocol::io_failure_message;
-use zagan_bet::roulette::{color as roulette_color, WHEEL};
+use zagan_bet::roulette::{WHEEL, color as roulette_color};
 
 use crate::connection::TlsStream;
 
@@ -71,8 +71,7 @@ impl ClientState {
                 self.core.set_connected(true);
                 self.core.set_logged_in(authed_user);
                 let fingerprint = database::get_fingerprint(&self.conn, addr);
-                self.core
-                    .set_host_info(Some(addr.to_string()), fingerprint);
+                self.core.set_host_info(Some(addr.to_string()), fingerprint);
                 database::save_host(&self.conn, addr);
             }
             Err(e) => {
@@ -178,12 +177,9 @@ impl ClientState {
                 Effect::Print(lines) => {
                     self.commit_prompt_line();
                     for line in lines {
-                        let rendered = if line.starts_with("ERROR")
-                            || line.contains("failed")
-                        {
+                        let rendered = if line.starts_with("ERROR") || line.contains("failed") {
                             line.as_str().red().to_string()
-                        } else if line.starts_with("Logged in")
-                            || line.starts_with("Successfully")
+                        } else if line.starts_with("Logged in") || line.starts_with("Successfully")
                         {
                             line.as_str().green().to_string()
                         } else if line.starts_with("Available commands:")
@@ -249,10 +245,7 @@ impl ClientState {
                 Effect::ForgetHost(target) => {
                     self.commit_prompt_line();
                     match database::forget_host(&self.conn, &target) {
-                        Ok(_) => println!(
-                            "Cleared trust and stored credentials for {}.",
-                            target
-                        ),
+                        Ok(_) => println!("Cleared trust and stored credentials for {}.", target),
                         Err(error) => println!("Failed to forget host: {}", error),
                     }
                 }
@@ -297,9 +290,7 @@ impl ClientState {
         let roulette = lines
             .first()
             .is_some_and(|first| first.contains("ROULETTE"));
-        let crash = lines
-            .first()
-            .is_some_and(|first| first.contains("CRASH"));
+        let crash = lines.first().is_some_and(|first| first.contains("CRASH"));
         let rendered: Vec<String> = lines
             .iter()
             .map(|line| {
diff --git a/src/bin/client/tls.rs b/src/bin/client/tls.rs
index b46f52b..e14ed98 100644
--- a/src/bin/client/tls.rs
+++ b/src/bin/client/tls.rs
@@ -17,10 +17,10 @@ use std::net::TcpStream;
 use std::sync::Arc;
 
 use parking_lot::Mutex;
-use rustls::client::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier};
 use rustls::DigitallySignedStruct;
+use rustls::client::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier};
 use zagan_bet::protocol::LineBuffer;
-use zagan_bet::tofu::{decide, spki_fingerprint, TrustDecision};
+use zagan_bet::tofu::{TrustDecision, decide, spki_fingerprint};
 
 pub struct TlsConnector {
     config: Arc<rustls::ClientConfig>,
@@ -53,7 +53,10 @@ impl TlsConnector {
         })
     }
 
-    pub fn connect(&self, stream: TcpStream) -> Result<TlsStream, Box<dyn std::error::Error + Send + Sync>> {
+    pub fn connect(
+        &self,
+        stream: TcpStream,
+    ) -> Result<TlsStream, Box<dyn std::error::Error + Send + Sync>> {
         let mut conn =
             rustls::ClientConnection::new(Arc::clone(&self.config), self.server_name.clone())?;
         let mut sock = stream;
@@ -200,10 +203,7 @@ impl TlsStream {
     }
 
     /// Apply a read timeout to the underlying TCP socket.
-    pub fn set_read_timeout(
-        &self,
-        duration: Option<std::time::Duration>,
-    ) -> std::io::Result<()> {
+    pub fn set_read_timeout(&self, duration: Option<std::time::Duration>) -> std::io::Result<()> {
         let mut s = self.session.lock();
         s.read_timeout = duration;
         s.sock.set_read_timeout(duration)
@@ -235,8 +235,7 @@ impl TlsStream {
                             Err(error)
                                 if matches!(
                                     error.kind(),
-                                    std::io::ErrorKind::WouldBlock
-                                        | std::io::ErrorKind::TimedOut
+                                    std::io::ErrorKind::WouldBlock | std::io::ErrorKind::TimedOut
                                 ) =>
                             {
                                 return Ok(());
diff --git a/src/bin/server/args.rs b/src/bin/server/args.rs
index 1babd1d..1db2a28 100644
--- a/src/bin/server/args.rs
+++ b/src/bin/server/args.rs
@@ -31,10 +31,7 @@ pub fn parse_args() -> Args {
                 if i + 1 < args.len() {
                     ip = args[i + 1].clone();
                     if ip != "127.0.0.1" && ip != "0.0.0.0" {
-                        eprintln!(
-                            "Invalid IP address: {}. Must be 127.0.0.1 or 0.0.0.0",
-                            ip
-                        );
+                        eprintln!("Invalid IP address: {}. Must be 127.0.0.1 or 0.0.0.0", ip);
                         std::process::exit(1);
                     }
                     i += 2;
diff --git a/src/bin/server/main.rs b/src/bin/server/main.rs
index 85e3134..f42574d 100644
--- a/src/bin/server/main.rs
+++ b/src/bin/server/main.rs
@@ -40,9 +40,9 @@ fn main() {
     let db_path = std::env::var("SERVER_DB").unwrap_or_else(|_| "server.db".to_string());
     match zagan_bet::server::core::recover_orphaned_reservations(&db_path) {
         Ok(0) => {}
-        Ok(count) => println!(
-            "Settled {count} orphaned reservation(s) as abandoned after a restart"
-        ),
+        Ok(count) => {
+            println!("Settled {count} orphaned reservation(s) as abandoned after a restart")
+        }
         Err(error) => {
             eprintln!("Failed to settle orphaned reservations in {db_path}: {error}");
             std::process::exit(1);
diff --git a/src/bin/server/tls.rs b/src/bin/server/tls.rs
index 5d84589..420b5b4 100644
--- a/src/bin/server/tls.rs
+++ b/src/bin/server/tls.rs
@@ -80,10 +80,7 @@ impl TlsStream {
 
     /// Read timeout for the socket. The connection loop uses a short one so it
     /// can advance crash rounds while no request is in flight.
-    pub fn set_read_timeout(
-        &self,
-        duration: Option<std::time::Duration>,
-    ) -> std::io::Result<()> {
+    pub fn set_read_timeout(&self, duration: Option<std::time::Duration>) -> std::io::Result<()> {
         self.stream.get_ref().set_read_timeout(duration)
     }
 }