From ae53d93f8eaab3e4307c9462fbd03e8e7d34dd7c Mon Sep 17 00:00:00 2001 From: Alexander Medvedev Date: Thu, 3 Apr 2025 18:24:19 +0200 Subject: [PATCH] fix rust 1.86 clippy warns --- pumpkin-protocol/src/codec/bit_set.rs | 2 +- pumpkin-protocol/src/codec/identifier.rs | 2 +- pumpkin-protocol/src/codec/var_int.rs | 2 +- pumpkin-protocol/src/codec/var_long.rs | 2 +- pumpkin/src/block/blocks/redstone/buttons.rs | 2 +- pumpkin/src/block/blocks/redstone/lever.rs | 2 +- pumpkin/src/block/blocks/redstone/turbo.rs | 8 ++++---- pumpkin/src/command/args/gamemode.rs | 2 +- pumpkin/src/command/args/mod.rs | 2 +- pumpkin/src/command/args/rotation.rs | 4 ++-- pumpkin/src/command/commands/bossbar.rs | 5 +++-- pumpkin/src/command/commands/experience.rs | 1 - pumpkin/src/command/commands/fill.rs | 2 +- pumpkin/src/command/commands/teleport.rs | 4 ++-- pumpkin/src/command/tree/format.rs | 4 ++-- pumpkin/src/entity/combat.rs | 2 +- pumpkin/src/entity/player.rs | 4 ++-- pumpkin/src/net/container.rs | 4 ++-- pumpkin/src/net/lan_broadcast.rs | 2 +- pumpkin/src/net/mod.rs | 14 +++++++------- pumpkin/src/net/packet/play.rs | 8 ++++---- pumpkin/src/world/mod.rs | 3 +-- 22 files changed, 40 insertions(+), 41 deletions(-) diff --git a/pumpkin-protocol/src/codec/bit_set.rs b/pumpkin-protocol/src/codec/bit_set.rs index 456df6f39..e7d3b12b6 100644 --- a/pumpkin-protocol/src/codec/bit_set.rs +++ b/pumpkin-protocol/src/codec/bit_set.rs @@ -15,7 +15,7 @@ pub struct BitSet(pub Box<[i64]>); impl Codec for BitSet { /// The maximum size of the `BitSet` is `remaining / 8`. - const MAX_SIZE: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(usize::MAX) }; + const MAX_SIZE: NonZeroUsize = NonZeroUsize::new(usize::MAX).unwrap(); fn written_size(&self) -> usize { todo!() diff --git a/pumpkin-protocol/src/codec/identifier.rs b/pumpkin-protocol/src/codec/identifier.rs index d87cd4431..889328e86 100644 --- a/pumpkin-protocol/src/codec/identifier.rs +++ b/pumpkin-protocol/src/codec/identifier.rs @@ -31,7 +31,7 @@ impl Identifier { } impl Codec for Identifier { /// The maximum number of bytes an `Identifier` is the same as for a normal `String`. - const MAX_SIZE: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(i16::MAX as usize) }; + const MAX_SIZE: NonZeroUsize = NonZeroUsize::new(i16::MAX as usize).unwrap(); fn written_size(&self) -> usize { todo!() diff --git a/pumpkin-protocol/src/codec/var_int.rs b/pumpkin-protocol/src/codec/var_int.rs index 986e4374e..7b6b85c3c 100644 --- a/pumpkin-protocol/src/codec/var_int.rs +++ b/pumpkin-protocol/src/codec/var_int.rs @@ -24,7 +24,7 @@ pub struct VarInt(pub VarIntType); impl Codec for VarInt { /// The maximum number of bytes a `VarInt` can occupy. - const MAX_SIZE: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(5) }; + const MAX_SIZE: NonZeroUsize = NonZeroUsize::new(5).unwrap(); /// Returns the exact number of bytes this VarInt will write when /// [`Encode::encode`] is called, assuming no error occurs. diff --git a/pumpkin-protocol/src/codec/var_long.rs b/pumpkin-protocol/src/codec/var_long.rs index a59f0fc2a..f1516d00c 100644 --- a/pumpkin-protocol/src/codec/var_long.rs +++ b/pumpkin-protocol/src/codec/var_long.rs @@ -23,7 +23,7 @@ pub struct VarLong(pub VarLongType); impl Codec for VarLong { /// The maximum number of bytes a `VarLong` can occupy. - const MAX_SIZE: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(10) }; + const MAX_SIZE: NonZeroUsize = NonZeroUsize::new(10).unwrap(); /// Returns the exact number of bytes this VarLong will write when /// [`Encode::encode`] is called, assuming no error occurs. diff --git a/pumpkin/src/block/blocks/redstone/buttons.rs b/pumpkin/src/block/blocks/redstone/buttons.rs index f2130c384..20f3016f9 100644 --- a/pumpkin/src/block/blocks/redstone/buttons.rs +++ b/pumpkin/src/block/blocks/redstone/buttons.rs @@ -90,7 +90,7 @@ pub fn register_button_blocks(manager: &mut BlockRegistry) { props.facing = *player_direction; } else { props.facing = face.opposite().to_cardinal_direction(); - }; + } props.to_state_id(block) } diff --git a/pumpkin/src/block/blocks/redstone/lever.rs b/pumpkin/src/block/blocks/redstone/lever.rs index ff499ed68..e4810bbb5 100644 --- a/pumpkin/src/block/blocks/redstone/lever.rs +++ b/pumpkin/src/block/blocks/redstone/lever.rs @@ -63,7 +63,7 @@ impl PumpkinBlock for LeverBlock { lever_props.facing = *player_direction; } else { lever_props.facing = face.opposite().to_cardinal_direction(); - }; + } lever_props.to_state_id(block) } diff --git a/pumpkin/src/block/blocks/redstone/turbo.rs b/pumpkin/src/block/blocks/redstone/turbo.rs index 53fc71a51..085b7fcf2 100644 --- a/pumpkin/src/block/blocks/redstone/turbo.rs +++ b/pumpkin/src/block/blocks/redstone/turbo.rs @@ -168,16 +168,16 @@ impl RedstoneWireTurbo { let mut cz = 0; if from_west { cx += 1; - }; + } if from_east { cx -= 1; - }; + } if from_north { cz += 1; - }; + } if from_south { cz -= 1; - }; + } let UpdateNode { xbias, zbias, .. } = &self.nodes[upd1.index]; let xbias = *xbias; diff --git a/pumpkin/src/command/args/gamemode.rs b/pumpkin/src/command/args/gamemode.rs index b30bf550e..218c5ceeb 100644 --- a/pumpkin/src/command/args/gamemode.rs +++ b/pumpkin/src/command/args/gamemode.rs @@ -37,7 +37,7 @@ impl ArgumentConsumer for GamemodeArgumentConsumer { if let Ok(gamemode) = GameMode::try_from(id) { return Some(Arg::GameMode(gamemode)); } - }; + } GameMode::from_str(s).map_or_else(|_| None, |gamemode| Some(Arg::GameMode(gamemode))) } diff --git a/pumpkin/src/command/args/mod.rs b/pumpkin/src/command/args/mod.rs index a2f2b5de2..0214e1add 100644 --- a/pumpkin/src/command/args/mod.rs +++ b/pumpkin/src/command/args/mod.rs @@ -185,7 +185,7 @@ impl<'a, T: DoubleEndedIterator> Iterator self.is_complete = true; return Some(&self.s[start..self.pos]); } - }; + } } } } diff --git a/pumpkin/src/command/args/rotation.rs b/pumpkin/src/command/args/rotation.rs index d05bf5faf..c080675c7 100644 --- a/pumpkin/src/command/args/rotation.rs +++ b/pumpkin/src/command/args/rotation.rs @@ -39,11 +39,11 @@ impl ArgumentConsumer for RotationArgumentConsumer { yaw %= 360.0; if yaw >= 180.0 { yaw -= 360.0; - }; + } pitch %= 360.0; if pitch >= 180.0 { pitch -= 360.0; - }; + } Some(Arg::Rotation(yaw, pitch)) } diff --git a/pumpkin/src/command/commands/bossbar.rs b/pumpkin/src/command/commands/bossbar.rs index b7e0fcf28..87ef3e642 100644 --- a/pumpkin/src/command/commands/bossbar.rs +++ b/pumpkin/src/command/commands/bossbar.rs @@ -19,6 +19,7 @@ use async_trait::async_trait; use pumpkin_util::text::TextComponent; use pumpkin_util::text::color::{Color, NamedColor}; use pumpkin_util::text::hover::HoverEvent; +use std::fmt::Write as _; use uuid::Uuid; const NAMES: [&str; 1] = ["bossbar"]; @@ -283,7 +284,7 @@ impl CommandExecutor for RemoveExecuter { handle_bossbar_error(sender, err).await; return Ok(()); } - }; + } Ok(()) } @@ -691,7 +692,7 @@ async fn handle_bossbar_error(sender: &CommandSender, error: BossbarUpdateError< key.push_str(value); key.push_str(".unchanged"); if let Some(variation) = variation { - key.push_str(&format!(".{variation}")); + write!(key, ".{variation}").unwrap(); } send_error_message(sender, TextComponent::translate(key, [])).await; diff --git a/pumpkin/src/command/commands/experience.rs b/pumpkin/src/command/commands/experience.rs index 59ff0803b..18ede74c8 100644 --- a/pumpkin/src/command/commands/experience.rs +++ b/pumpkin/src/command/commands/experience.rs @@ -259,7 +259,6 @@ impl CommandExecutor for Executor { .color(Color::Named(NamedColor::Red)), ) .await; - continue; } } } diff --git a/pumpkin/src/command/commands/fill.rs b/pumpkin/src/command/commands/fill.rs index 49f956d36..cc23efb56 100644 --- a/pumpkin/src/command/commands/fill.rs +++ b/pumpkin/src/command/commands/fill.rs @@ -183,7 +183,7 @@ impl CommandExecutor for Executor { } } } - }; + } sender .send_message(TextComponent::translate( diff --git a/pumpkin/src/command/commands/teleport.rs b/pumpkin/src/command/commands/teleport.rs index 655171f52..98beb7f4e 100644 --- a/pumpkin/src/command/commands/teleport.rs +++ b/pumpkin/src/command/commands/teleport.rs @@ -198,7 +198,7 @@ impl CommandExecutor for SelfToEntityExecutor { .send_message(TextComponent::translate("permissions.requires.player", [])) .await; } - }; + } Ok(()) } @@ -226,7 +226,7 @@ impl CommandExecutor for SelfToPosExecutor { .send_message(TextComponent::translate("permissions.requires.player", [])) .await; } - }; + } Ok(()) } diff --git a/pumpkin/src/command/tree/format.rs b/pumpkin/src/command/tree/format.rs index 597aece0d..e9b6f8431 100644 --- a/pumpkin/src/command/tree/format.rs +++ b/pumpkin/src/command/tree/format.rs @@ -28,7 +28,7 @@ impl Display for Node { f.write_char('>')?; } _ => {} - }; + } Ok(()) } @@ -72,7 +72,7 @@ impl Display for CommandTree { if visible_children.is_empty() { break; - }; + } f.write_char(' ')?; diff --git a/pumpkin/src/entity/combat.rs b/pumpkin/src/entity/combat.rs index a3ca66ed3..2de6ab679 100644 --- a/pumpkin/src/entity/combat.rs +++ b/pumpkin/src/entity/combat.rs @@ -125,5 +125,5 @@ pub async fn player_attack_sound(pos: &Vector3, world: &World, attack_type: .play_sound(Sound::EntityPlayerAttackWeak, SoundCategory::Players, pos) .await; } - }; + } } diff --git a/pumpkin/src/entity/player.rs b/pumpkin/src/entity/player.rs index 702c0cd0c..b28b0ce7c 100644 --- a/pumpkin/src/entity/player.rs +++ b/pumpkin/src/entity/player.rs @@ -459,7 +459,7 @@ impl Player { combat::spawn_sweep_particle(attacker_entity, &world, &pos).await; } _ => {} - }; + } if config.knockback { combat::handle_knockback( attacker_entity, @@ -1707,7 +1707,7 @@ impl Player { // TODO: We give an error if all play packets are implemented // return Err(Box::new(DeserializerError::UnknownPacket)); } - }; + } Ok(()) } } diff --git a/pumpkin/src/net/container.rs b/pumpkin/src/net/container.rs index 4f2a01886..974094ad5 100644 --- a/pumpkin/src/net/container.rs +++ b/pumpkin/src/net/container.rs @@ -335,7 +335,7 @@ impl Player { *carried_item = None; } } - }; + } } Ok(()) } @@ -463,7 +463,7 @@ impl Player { } } container_click::Slot::OutsideInventory => (), - }; + } Ok(()) } diff --git a/pumpkin/src/net/lan_broadcast.rs b/pumpkin/src/net/lan_broadcast.rs index 616055089..645f003c6 100644 --- a/pumpkin/src/net/lan_broadcast.rs +++ b/pumpkin/src/net/lan_broadcast.rs @@ -37,7 +37,7 @@ pub async fn start_lan_broadcast(bound_addr: SocketAddr) { ); } else { motd = advanced_motd.clone(); - }; + } let advertisement = format!("[MOTD]{}[/MOTD][AD]{}[/AD]", &motd, bound_addr.port()); diff --git a/pumpkin/src/net/mod.rs b/pumpkin/src/net/mod.rs index 2629dd07e..ea35d3430 100644 --- a/pumpkin/src/net/mod.rs +++ b/pumpkin/src/net/mod.rs @@ -392,7 +392,7 @@ impl Client { if let Err(err) = packet.write(&mut packet_buf) { log::error!("Failed to serialize packet {}: {}", P::PACKET_ID, err); return; - }; + } if let Err(err) = self .network_writer @@ -437,7 +437,7 @@ impl Client { error ); self.kick(TextComponent::text(text)).await; - }; + } } } @@ -505,7 +505,7 @@ impl Client { packet.id ); } - }; + } Ok(()) } @@ -530,7 +530,7 @@ impl Client { packet.id ); } - }; + } Ok(()) } @@ -567,7 +567,7 @@ impl Client { packet.id ); } - }; + } Ok(()) } @@ -607,7 +607,7 @@ impl Client { packet.id ); } - }; + } Ok(()) } @@ -637,7 +637,7 @@ impl Client { log::warn!("Can't kick in {:?} State", self.connection_state); return; } - }; + } log::debug!("Closing connection for {}", self.id); self.close(); } diff --git a/pumpkin/src/net/packet/play.rs b/pumpkin/src/net/packet/play.rs index 2c1e2f526..4fc1a4e50 100644 --- a/pumpkin/src/net/packet/play.rs +++ b/pumpkin/src/net/packet/play.rs @@ -847,7 +847,7 @@ impl Player { self.kick(TextComponent::text("Invalid client status")) .await; } - }; + } } pub async fn handle_interact(&self, interact: SInteract) { @@ -920,7 +920,7 @@ impl Player { )) .await; return; - }; + } } ActionType::Interact | ActionType::InteractAt => { log::debug!("todo"); @@ -1233,7 +1233,7 @@ impl Player { if let Some(entity) = entity_from_egg(stack.item.id) { self.spawn_entity_from_egg(entity, location, &face).await; should_try_decrement = true; - }; + } if should_try_decrement { // TODO: Config @@ -1325,7 +1325,7 @@ impl Player { // Item drop self.drop_item(item_stack.item.id, u32::from(item_stack.item_count)) .await; - }; + } Ok(()) } diff --git a/pumpkin/src/world/mod.rs b/pumpkin/src/world/mod.rs index e36e6bcf7..54520d19c 100644 --- a/pumpkin/src/world/mod.rs +++ b/pumpkin/src/world/mod.rs @@ -1141,8 +1141,7 @@ impl World { /// /// # Arguments /// * `pos`: The center of the sphere. - /// * `radius`: The radius of the sphere. The higher the radius, - /// the more area will be checked (in every direction). + /// * `radius`: The radius of the sphere. The higher the radius, the more area will be checked (in every direction). pub async fn get_nearby_players( &self, pos: Vector3,