From 1c9e089b7268fe4ffeeee5e594bb2d708470d2a1 Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 15 Dec 2021 14:06:14 -0600 Subject: clippy --- minecraft-client/src/connect.rs | 4 ++-- minecraft-client/src/ping.rs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'minecraft-client') diff --git a/minecraft-client/src/connect.rs b/minecraft-client/src/connect.rs index e6a23612..4bf937db 100644 --- a/minecraft-client/src/connect.rs +++ b/minecraft-client/src/connect.rs @@ -34,9 +34,9 @@ pub async fn join_server(address: &ServerAddress) -> Result<(), String> { // encryption request let packet = conn.read().await.unwrap(); - let encryption_request_packet = match packet { + let _encryption_request_packet = match packet { LoginPacket::ClientboundHelloPacket(p) => p, - _ => Err(format!("Invalid packet type: {:?}", packet))?, + _ => return Err(format!("Invalid packet type: {:?}", packet)), }; // TODO: client auth diff --git a/minecraft-client/src/ping.rs b/minecraft-client/src/ping.rs index 88c0a24a..ff869d4e 100644 --- a/minecraft-client/src/ping.rs +++ b/minecraft-client/src/ping.rs @@ -37,8 +37,8 @@ pub async fn ping_server( let packet = conn.read().await.unwrap(); - Ok(match packet { - StatusPacket::ClientboundStatusResponsePacket(p) => p, - _ => Err("Invalid packet type".to_string())?, - }) + match packet { + StatusPacket::ClientboundStatusResponsePacket(p) => Ok(*p), + _ => Err("Invalid packet type".to_string()), + } } -- cgit v1.2.3