From f6967c01a5c1ae03dcb2a7c17fdad5464c43732d Mon Sep 17 00:00:00 2001 From: TudbuT Date: Tue, 31 Jan 2023 22:08:11 +0100 Subject: [PATCH] cargo fmt --- src/client.rs | 3 ++- src/main.rs | 16 ++++++++++++++-- src/socket_adapter.rs | 4 +--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/client.rs b/src/client.rs index d67826e..2f32346 100644 --- a/src/client.rs +++ b/src/client.rs @@ -85,7 +85,8 @@ pub fn client(ip: &str, port: u16, dest_ip: &str, dest_port: u16, key: &str, sle tcp.set_nonblocking(false); match pt { PacketType::NewClient => { - let mut tcp = SocketAdapter::new(TcpStream::connect((dest_ip, dest_port)).unwrap(), false); + let mut tcp = + SocketAdapter::new(TcpStream::connect((dest_ip, dest_port)).unwrap(), false); tcp.set_nonblocking(true); sockets.push(tcp); } diff --git a/src/main.rs b/src/main.rs index 25391d4..bb013db 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,11 +11,23 @@ fn main() { &args[3], args[4].parse().unwrap(), &args[5], - if args.len() == 7 { args[6].parse().unwrap() } else { 1 } + if args.len() == 7 { + args[6].parse().unwrap() + } else { + 1 + }, ); } if (3..=4).contains(&args.len()) && args[0] == "server" { - server(args[1].parse().unwrap(), &args[2], if args.len() == 4 { args[3].parse().unwrap() } else { 1 }); + server( + args[1].parse().unwrap(), + &args[2], + if args.len() == 4 { + args[3].parse().unwrap() + } else { + 1 + }, + ); } eprintln!("Usage: \n\ \x20 revpfw3 server []\n\ diff --git a/src/socket_adapter.rs b/src/socket_adapter.rs index adc300b..2335e38 100644 --- a/src/socket_adapter.rs +++ b/src/socket_adapter.rs @@ -108,9 +108,7 @@ impl SocketAdapter { } Ok(()) } - Err(x) if x.kind() == ErrorKind::WouldBlock => { - Ok(()) - } + Err(x) if x.kind() == ErrorKind::WouldBlock => Ok(()), Err(x) => { self.broken = Some(Broken::OsErr(x.raw_os_error().unwrap())); Err(x)