From e7d2c6f64c8c8e84ae4f9b2863c6b26436f7f2e9 Mon Sep 17 00:00:00 2001
From: timvisee <tim@visee.me>
Date: Thu, 25 Nov 2021 13:39:52 +0100
Subject: [PATCH] Resolve clippy warnings

---
 src/forge.rs                        | 6 +++---
 src/mc/dimension.rs                 | 2 +-
 src/probe.rs                        | 2 +-
 src/proto/packets/play/join_game.rs | 4 ++--
 src/proto/packets/play/respawn.rs   | 4 ++--
 src/proto/packets/play/title.rs     | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/forge.rs b/src/forge.rs
index 7c80bb9..3218a55 100644
--- a/src/forge.rs
+++ b/src/forge.rs
@@ -83,7 +83,7 @@ pub async fn respond_login_plugin_request(
 ) -> Result<(), ()> {
     // Decode Forge login wrapper packet
     let (message_id, login_wrapper, packet) =
-        forge::decode_forge_login_packet(&client, packet).await?;
+        forge::decode_forge_login_packet(client, packet).await?;
 
     // Determine whether we received the mod list
     let is_unknown_header = login_wrapper.channel != forge::CHANNEL_HANDSHAKE;
@@ -166,7 +166,7 @@ pub async fn replay_login_payload(
 
     // Replay each Forge packet
     for packet in server.forge_payload.lock().await.as_slice() {
-        inbound.write_all(&packet).await.map_err(|err| {
+        inbound.write_all(packet).await.map_err(|err| {
             error!(target: "lazymc::lobby", "Failed to send Forge join payload to lobby client, will likely cause issues: {}", err);
         })?;
     }
@@ -198,7 +198,7 @@ async fn drain_forge_responses(
         }
 
         // TODO: move timeout into constant
-        let read_packet_task = packet::read_packet(&client, buf, &mut reader);
+        let read_packet_task = packet::read_packet(client, buf, &mut reader);
         let timeout = time::timeout(Duration::from_secs(5), read_packet_task).await;
 
         let read_packet_task = match timeout {
diff --git a/src/mc/dimension.rs b/src/mc/dimension.rs
index 0090f3f..1d06fd6 100644
--- a/src/mc/dimension.rs
+++ b/src/mc/dimension.rs
@@ -102,7 +102,7 @@ fn snbt_to_compound_tag(data: &str) -> CompoundTag {
         .expect("failed to encode NBT CompoundTag as binary");
 
     // Parse binary with usable NBT create
-    bin_to_compound_tag(&mut &*binary)
+    bin_to_compound_tag(&binary)
 }
 
 /// Read NBT CompoundTag from SNBT.
diff --git a/src/probe.rs b/src/probe.rs
index 739ba74..53ab876 100644
--- a/src/probe.rs
+++ b/src/probe.rs
@@ -53,7 +53,7 @@ pub async fn probe(config: Arc<Config>, server: Arc<Server>) -> Result<(), ()> {
 
     // Connect to server, record Forge payload
     let forge_payload = connect_to_server(&config, &server).await?;
-    *server.forge_payload.lock().await = forge_payload.into();
+    *server.forge_payload.lock().await = forge_payload;
 
     Ok(())
 }
diff --git a/src/proto/packets/play/join_game.rs b/src/proto/packets/play/join_game.rs
index 1d7f444..b72d18d 100644
--- a/src/proto/packets/play/join_game.rs
+++ b/src/proto/packets/play/join_game.rs
@@ -89,11 +89,11 @@ pub async fn lobby_send(
 ) -> Result<(), ()> {
     // Get dimension codec and build lobby dimension
     let dimension_codec: CompoundTag =
-        if let Some(ref join_game) = server.probed_join_game.lock().await.as_ref() {
+        if let Some(join_game) = server.probed_join_game.lock().await.as_ref() {
             join_game
                 .dimension_codec
                 .clone()
-                .unwrap_or_else(|| dimension::default_dimension_codec())
+                .unwrap_or_else(dimension::default_dimension_codec)
         } else {
             dimension::default_dimension_codec()
         };
diff --git a/src/proto/packets/play/respawn.rs b/src/proto/packets/play/respawn.rs
index ee21d9d..5350911 100644
--- a/src/proto/packets/play/respawn.rs
+++ b/src/proto/packets/play/respawn.rs
@@ -23,7 +23,7 @@ pub async fn lobby_send(
                         dimension::lobby_dimension(
                             &data
                                 .dimension_codec
-                                .unwrap_or_else(|| dimension::default_dimension_codec()),
+                                .unwrap_or_else(dimension::default_dimension_codec),
                         )
                     }),
                     world_name: data.world_name.unwrap_or_else(|| "world".into()),
@@ -46,7 +46,7 @@ pub async fn lobby_send(
                         dimension::lobby_dimension(
                             &data
                                 .dimension_codec
-                                .unwrap_or_else(|| dimension::default_dimension_codec()),
+                                .unwrap_or_else(dimension::default_dimension_codec),
                         )
                     }),
                     world_name: data.world_name.unwrap_or_else(|| "world".into()),
diff --git a/src/proto/packets/play/title.rs b/src/proto/packets/play/title.rs
index af9a2ec..3ae0622 100644
--- a/src/proto/packets/play/title.rs
+++ b/src/proto/packets/play/title.rs
@@ -58,7 +58,7 @@ async fn send_v1_16_3(
     packet::write_packet(
         Title {
             action: TitleAction::SetSubtitle {
-                text: Message::new(Payload::text(&subtitle)),
+                text: Message::new(Payload::text(subtitle)),
             },
         },
         client,
@@ -111,7 +111,7 @@ async fn send_v1_17(
     // Set subtitle
     packet::write_packet(
         SetTitleSubtitle {
-            text: Message::new(Payload::text(&subtitle)),
+            text: Message::new(Payload::text(subtitle)),
         },
         client,
         writer,