fix clippy issues and improve formatting everywhere

8 files changed, 86 insertions, 88 deletions

diff --git a/azalea-client/src/entity_query.rs b/azalea-client/src/entity_query.rs
index 77be68a8..e6bef25f 100644
--- a/azalea-client/src/entity_query.rs
+++ b/azalea-client/src/entity_query.rs
@@ -1,4 +1,4 @@
-use std::sync::Arc;
+use std::{any, sync::Arc};
 
 use bevy_ecs::{
     component::Component,
@@ -29,7 +29,7 @@ impl Client {
             .unwrap_or_else(|_| {
                 panic!(
                     "Our client is missing a required component {:?}",
-                    std::any::type_name::<D>()
+                    any::type_name::<D>()
                 )
             })
     }
@@ -77,7 +77,7 @@ impl Client {
         let components = q.get(&ecs, entity).unwrap_or_else(|_| {
             panic!(
                 "Entity is missing a required component {:?}",
-                std::any::type_name::<Q>()
+                any::type_name::<Q>()
             )
         });
         components.clone()
diff --git a/azalea-client/src/local_player.rs b/azalea-client/src/local_player.rs
index 26e08e9b..ee318c06 100644
--- a/azalea-client/src/local_player.rs
+++ b/azalea-client/src/local_player.rs
@@ -1,4 +1,8 @@
-use std::{collections::HashMap, io, sync::Arc};
+use std::{
+    collections::HashMap,
+    error, io,
+    sync::{Arc, PoisonError},
+};
 
 use azalea_auth::game_profile::GameProfile;
 use azalea_core::game_type::GameMode;
@@ -169,13 +173,13 @@ pub enum HandlePacketError {
     #[error(transparent)]
     Io(#[from] io::Error),
     #[error(transparent)]
-    Other(#[from] Box<dyn std::error::Error + Send + Sync>),
+    Other(#[from] Box<dyn error::Error + Send + Sync>),
     #[error("{0}")]
     Send(#[from] mpsc::error::SendError<AzaleaEvent>),
 }
 
-impl<T> From<std::sync::PoisonError<T>> for HandlePacketError {
-    fn from(e: std::sync::PoisonError<T>) -> Self {
+impl<T> From<PoisonError<T>> for HandlePacketError {
+    fn from(e: PoisonError<T>) -> Self {
         HandlePacketError::Poison(e.to_string())
     }
 }
diff --git a/azalea-client/src/plugins/chat_signing.rs b/azalea-client/src/plugins/chat_signing.rs
index 9863cb3f..8961430e 100644
--- a/azalea-client/src/plugins/chat_signing.rs
+++ b/azalea-client/src/plugins/chat_signing.rs
@@ -102,10 +102,10 @@ pub fn request_certs_if_needed(
     >,
 ) {
     for (entity, account, only_refresh_certs_after, chat_signing_session) in query.iter_mut() {
-        if let Some(only_refresh_certs_after) = only_refresh_certs_after {
-            if only_refresh_certs_after.refresh_at > Instant::now() {
-                continue;
-            }
+        if let Some(only_refresh_certs_after) = only_refresh_certs_after
+            && only_refresh_certs_after.refresh_at > Instant::now()
+        {
+            continue;
         }
 
         let certs = account.certs.lock();
@@ -124,20 +124,18 @@ pub fn request_certs_if_needed(
         };
         drop(certs);
 
-        if should_refresh {
-            if let Some(access_token) = &account.access_token {
-                let task_pool = IoTaskPool::get();
-
-                let access_token = access_token.lock().clone();
-                debug!("Started task to fetch certs");
-                let task = task_pool.spawn(async_compat::Compat::new(async move {
-                    azalea_auth::certs::fetch_certificates(&access_token).await
-                }));
-                commands
-                    .entity(entity)
-                    .insert(RequestCertsTask(task))
-                    .remove::<OnlyRefreshCertsAfter>();
-            }
+        if should_refresh && let Some(access_token) = &account.access_token {
+            let task_pool = IoTaskPool::get();
+
+            let access_token = access_token.lock().clone();
+            debug!("Started task to fetch certs");
+            let task = task_pool.spawn(async_compat::Compat::new(async move {
+                azalea_auth::certs::fetch_certificates(&access_token).await
+            }));
+            commands
+                .entity(entity)
+                .insert(RequestCertsTask(task))
+                .remove::<OnlyRefreshCertsAfter>();
         }
     }
 }
diff --git a/azalea-client/src/plugins/chunks.rs b/azalea-client/src/plugins/chunks.rs
index 5e062887..8b052f63 100644
--- a/azalea-client/src/plugins/chunks.rs
+++ b/azalea-client/src/plugins/chunks.rs
@@ -84,14 +84,12 @@ pub fn handle_receive_chunk_events(
         let shared_chunk = instance.chunks.get(&pos);
         let this_client_has_chunk = partial_instance.chunks.limited_get(&pos).is_some();
 
-        if !this_client_has_chunk {
-            if let Some(shared_chunk) = shared_chunk {
-                trace!("Skipping parsing chunk {pos:?} because we already know about it");
-                partial_instance
-                    .chunks
-                    .limited_set(&pos, Some(shared_chunk));
-                continue;
-            }
+        if !this_client_has_chunk && let Some(shared_chunk) = shared_chunk {
+            trace!("Skipping parsing chunk {pos:?} because we already know about it");
+            partial_instance
+                .chunks
+                .limited_set(&pos, Some(shared_chunk));
+            continue;
         }
 
         let heightmaps = &event.packet.chunk_data.heightmaps;
diff --git a/azalea-client/src/plugins/inventory.rs b/azalea-client/src/plugins/inventory.rs
index 0a9c5cad..829b37f8 100644
--- a/azalea-client/src/plugins/inventory.rs
+++ b/azalea-client/src/plugins/inventory.rs
@@ -170,17 +170,17 @@ impl Inventory {
             }
             if let QuickCraftStatus::Add { slot } = quick_craft.status {
                 let slot_item = self.menu().slot(slot as usize);
-                if let Some(slot_item) = slot_item {
-                    if let ItemStack::Present(carried) = &self.carried {
-                        // minecraft also checks slot.may_place(carried) and
-                        // menu.can_drag_to(slot)
-                        // but they always return true so they're not relevant for us
-                        if can_item_quick_replace(slot_item, &self.carried, true)
-                            && (self.quick_craft_kind == QuickCraftKind::Right
-                                || carried.count as usize > self.quick_craft_slots.len())
-                        {
-                            self.quick_craft_slots.insert(slot);
-                        }
+                if let Some(slot_item) = slot_item
+                    && let ItemStack::Present(carried) = &self.carried
+                {
+                    // minecraft also checks slot.may_place(carried) and
+                    // menu.can_drag_to(slot)
+                    // but they always return true so they're not relevant for us
+                    if can_item_quick_replace(slot_item, &self.carried, true)
+                        && (self.quick_craft_kind == QuickCraftKind::Right
+                            || carried.count as usize > self.quick_craft_slots.len())
+                    {
+                        self.quick_craft_slots.insert(slot);
                     }
                 }
                 return;
@@ -468,26 +468,23 @@ impl Inventory {
                     for i in iterator {
                         if target_slot_item.count < target_slot_item.kind.max_stack_size() {
                             let checking_slot = self.menu().slot(i).unwrap();
-                            if let ItemStack::Present(checking_item) = checking_slot {
-                                if can_item_quick_replace(checking_slot, &target_slot, true)
-                                    && self.menu().may_pickup(i)
-                                    && (round != 0
-                                        || checking_item.count
-                                            != checking_item.kind.max_stack_size())
-                                {
-                                    // get the checking_slot and checking_item again but mutable
-                                    let checking_slot = self.menu_mut().slot_mut(i).unwrap();
-
-                                    let taken_item =
-                                        checking_slot.split(checking_slot.count() as u32);
-
-                                    // now extend the carried item
-                                    let target_slot = &mut self.carried;
-                                    let ItemStack::Present(target_slot_item) = target_slot else {
-                                        unreachable!("target slot is not empty but is not present");
-                                    };
-                                    target_slot_item.count += taken_item.count();
-                                }
+                            if let ItemStack::Present(checking_item) = checking_slot
+                                && can_item_quick_replace(checking_slot, &target_slot, true)
+                                && self.menu().may_pickup(i)
+                                && (round != 0
+                                    || checking_item.count != checking_item.kind.max_stack_size())
+                            {
+                                // get the checking_slot and checking_item again but mutable
+                                let checking_slot = self.menu_mut().slot_mut(i).unwrap();
+
+                                let taken_item = checking_slot.split(checking_slot.count() as u32);
+
+                                // now extend the carried item
+                                let target_slot = &mut self.carried;
+                                let ItemStack::Present(target_slot_item) = target_slot else {
+                                    unreachable!("target slot is not empty but is not present");
+                                };
+                                target_slot_item.count += taken_item.count();
                             }
                         }
                     }
diff --git a/azalea-client/src/plugins/join.rs b/azalea-client/src/plugins/join.rs
index e31c64c4..a3447782 100644
--- a/azalea-client/src/plugins/join.rs
+++ b/azalea-client/src/plugins/join.rs
@@ -96,20 +96,20 @@ pub fn handle_start_join_server_event(
             debug!("Reusing entity {entity:?} for client");
 
             // check if it's already connected
-            if let Ok(conn) = connection_query.get(entity) {
-                if conn.is_alive() {
-                    if let Some(start_join_callback_tx) = &event.start_join_callback_tx {
-                        warn!(
-                            "Received StartJoinServerEvent for {entity:?} but it's already connected. Ignoring the event but replying with Ok."
-                        );
-                        let _ = start_join_callback_tx.0.send(Ok(entity));
-                    } else {
-                        warn!(
-                            "Received StartJoinServerEvent for {entity:?} but it's already connected. Ignoring the event."
-                        );
-                    }
-                    return;
+            if let Ok(conn) = connection_query.get(entity)
+                && conn.is_alive()
+            {
+                if let Some(start_join_callback_tx) = &event.start_join_callback_tx {
+                    warn!(
+                        "Received StartJoinServerEvent for {entity:?} but it's already connected. Ignoring the event but replying with Ok."
+                    );
+                    let _ = start_join_callback_tx.0.send(Ok(entity));
+                } else {
+                    warn!(
+                        "Received StartJoinServerEvent for {entity:?} but it's already connected. Ignoring the event."
+                    );
                 }
+                return;
             }
 
             entity
diff --git a/azalea-client/src/plugins/movement.rs b/azalea-client/src/plugins/movement.rs
index 2d844064..95fdeb6e 100644
--- a/azalea-client/src/plugins/movement.rs
+++ b/azalea-client/src/plugins/movement.rs
@@ -1,4 +1,5 @@
 use std::backtrace::Backtrace;
+use std::io;
 
 use azalea_core::position::Vec3;
 use azalea_core::tick::GameTick;
@@ -28,7 +29,7 @@ pub enum MovePlayerError {
     #[error("Player is not in world")]
     PlayerNotInWorld(Backtrace),
     #[error("{0}")]
-    Io(#[from] std::io::Error),
+    Io(#[from] io::Error),
 }
 
 impl From<MoveEntityError> for MovePlayerError {
diff --git a/azalea-client/tests/reply_to_ping_with_pong.rs b/azalea-client/tests/reply_to_ping_with_pong.rs
index d921c905..bc8bccd4 100644
--- a/azalea-client/tests/reply_to_ping_with_pong.rs
+++ b/azalea-client/tests/reply_to_ping_with_pong.rs
@@ -28,11 +28,11 @@ fn reply_to_ping_with_pong() {
     simulation
         .app
         .add_observer(move |trigger: Trigger<SendConfigPacketEvent>| {
-            if trigger.sent_by == simulation.entity {
-                if let ServerboundConfigPacket::Pong(packet) = &trigger.packet {
-                    assert_eq!(packet.id, 321);
-                    *reply_count_clone.lock() += 1;
-                }
+            if trigger.sent_by == simulation.entity
+                && let ServerboundConfigPacket::Pong(packet) = &trigger.packet
+            {
+                assert_eq!(packet.id, 321);
+                *reply_count_clone.lock() += 1;
             }
         });
 
@@ -63,11 +63,11 @@ fn reply_to_ping_with_pong() {
     simulation
         .app
         .add_observer(move |trigger: Trigger<SendPacketEvent>| {
-            if trigger.sent_by == simulation.entity {
-                if let ServerboundGamePacket::Pong(packet) = &trigger.packet {
-                    assert_eq!(packet.id, 123);
-                    *reply_count_clone.lock() += 1;
-                }
+            if trigger.sent_by == simulation.entity
+                && let ServerboundGamePacket::Pong(packet) = &trigger.packet
+            {
+                assert_eq!(packet.id, 123);
+                *reply_count_clone.lock() += 1;
             }
         });