From cc004df6e8fc57064d7a23c976004d38b38ce789 Mon Sep 17 00:00:00 2001 From: John Doty Date: Sat, 10 Aug 2024 06:42:57 -0700 Subject: [PATCH] Clippy --- src/client/ui.rs | 11 +++++------ src/message.rs | 3 +-- src/server/mod.rs | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/client/ui.rs b/src/client/ui.rs index d49f927..d8a3751 100644 --- a/src/client/ui.rs +++ b/src/client/ui.rs @@ -476,15 +476,14 @@ impl UI { ev: Option>, ) { match ev { - Some(Ok(Event::Key(ev))) => match ev { + Some(Ok(Event::Key( KeyEvent { code: KeyCode::Esc, .. } | KeyEvent { code: KeyCode::Char('q'), .. } | KeyEvent { code: KeyCode::Char('?'), .. } - | KeyEvent { code: KeyCode::Char('h'), .. } => { - self.show_help = false; - } - _ => (), - }, + | KeyEvent { code: KeyCode::Char('h'), .. }, + ))) => { + self.show_help = false; + } Some(Ok(_)) => (), // Don't care about this event... Some(Err(_)) => (), // Hmmmmmm.....? None => (), // ....no events? what? diff --git a/src/message.rs b/src/message.rs index 6b77615..f347727 100644 --- a/src/message.rs +++ b/src/message.rs @@ -99,8 +99,7 @@ impl Message { result.put_u16(port.port); // Port descriptions can be long, let's make sure they're not. - let sliced = - slice_up_to(&port.desc, u16::max_value().into()); + let sliced = slice_up_to(&port.desc, u16::MAX.into()); put_string(result, sliced); } } diff --git a/src/server/mod.rs b/src/server/mod.rs index 804d877..42b8799 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -114,7 +114,7 @@ mod tests { use tokio::io::{AsyncReadExt, DuplexStream}; async fn sync(client_read: &mut DuplexStream) { - print!("[client] Waiting for server sync...\n"); + println!("[client] Waiting for server sync..."); for _ in 0..8 { let b = client_read .read_u8() @@ -124,7 +124,7 @@ mod tests { } let mut reader = MessageReader::new(client_read); - print!("[client] Reading first message...\n"); + println!("[client] Reading first message..."); let msg = reader.read().await.expect("Error reading first message"); assert_matches!(msg, Message::Hello(0, 2, _)); }