From 12e37327653d95b869758bf7c598c79148756089 Mon Sep 17 00:00:00 2001 From: DaniD3v Date: Sat, 31 Aug 2024 20:16:57 +0200 Subject: [PATCH] Replaced #[allow()]'s with #[expect()] --- pumpkin-protocol/src/client/play/c_login.rs | 2 +- pumpkin-protocol/src/client/play/c_particle.rs | 2 +- pumpkin-protocol/src/client/play/c_player_chat_message.rs | 2 +- pumpkin-protocol/src/client/play/c_spawn_player.rs | 2 +- pumpkin-world/src/chunk.rs | 6 +++--- pumpkin-world/src/item/item_registry.rs | 4 ++-- pumpkin-world/src/level.rs | 2 +- pumpkin-world/src/world_gen/seed.rs | 2 +- pumpkin/src/client/authentication.rs | 6 +++--- pumpkin/src/commands/cmd_gamemode.rs | 4 ++-- pumpkin/src/commands/tree_builder.rs | 2 +- pumpkin/src/main.rs | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pumpkin-protocol/src/client/play/c_login.rs b/pumpkin-protocol/src/client/play/c_login.rs index 7990bba96..5fcbf28b4 100644 --- a/pumpkin-protocol/src/client/play/c_login.rs +++ b/pumpkin-protocol/src/client/play/c_login.rs @@ -30,7 +30,7 @@ pub struct CLogin<'a> { } impl<'a> CLogin<'a> { - #[allow(clippy::too_many_arguments)] + #[expect(clippy::too_many_arguments)] pub fn new( entity_id: i32, is_hardcore: bool, diff --git a/pumpkin-protocol/src/client/play/c_particle.rs b/pumpkin-protocol/src/client/play/c_particle.rs index c3fa35a17..4ea1b66a2 100644 --- a/pumpkin-protocol/src/client/play/c_particle.rs +++ b/pumpkin-protocol/src/client/play/c_particle.rs @@ -21,7 +21,7 @@ pub struct CParticle<'a> { } impl<'a> CParticle<'a> { - #[allow(clippy::too_many_arguments)] + #[expect(clippy::too_many_arguments)] pub fn new( long_distance: bool, x: f64, diff --git a/pumpkin-protocol/src/client/play/c_player_chat_message.rs b/pumpkin-protocol/src/client/play/c_player_chat_message.rs index a79d0516c..8ec95ddca 100644 --- a/pumpkin-protocol/src/client/play/c_player_chat_message.rs +++ b/pumpkin-protocol/src/client/play/c_player_chat_message.rs @@ -22,7 +22,7 @@ pub struct CPlayerChatMessage<'a> { } impl<'a> CPlayerChatMessage<'a> { - #[allow(clippy::too_many_arguments)] + #[expect(clippy::too_many_arguments)] pub fn new( sender: UUID, index: VarInt, diff --git a/pumpkin-protocol/src/client/play/c_spawn_player.rs b/pumpkin-protocol/src/client/play/c_spawn_player.rs index ca3a7e3cc..73d0f8541 100644 --- a/pumpkin-protocol/src/client/play/c_spawn_player.rs +++ b/pumpkin-protocol/src/client/play/c_spawn_player.rs @@ -22,7 +22,7 @@ pub struct CSpawnEntity { } impl CSpawnEntity { - #[allow(clippy::too_many_arguments)] + #[expect(clippy::too_many_arguments)] pub fn new( entity_id: VarInt, entity_uuid: UUID, diff --git a/pumpkin-world/src/chunk.rs b/pumpkin-world/src/chunk.rs index 1c13d423c..dd5aa643b 100644 --- a/pumpkin-world/src/chunk.rs +++ b/pumpkin-world/src/chunk.rs @@ -54,7 +54,7 @@ pub struct ChunkHeightmaps { } #[derive(Deserialize, Debug)] -#[allow(dead_code)] +#[expect(dead_code)] struct ChunkSection { #[serde(rename = "Y")] y: i32, @@ -64,7 +64,7 @@ struct ChunkSection { #[derive(Deserialize, Debug)] #[serde(rename_all = "PascalCase")] struct ChunkNbt { - #[allow(dead_code)] + #[expect(dead_code)] data_version: usize, #[serde(rename = "sections")] @@ -171,7 +171,7 @@ impl ChunkBlocks { index.y.get_absolute() as usize * CHUNK_AREA + *index.z as usize * 16 + *index.x as usize } - #[allow(dead_code)] + #[expect(dead_code)] fn calculate_heightmap(&self) -> ChunkHeightmaps { // figure out how LongArray is formatted // figure out how to find out if block is motion blocking diff --git a/pumpkin-world/src/item/item_registry.rs b/pumpkin-world/src/item/item_registry.rs index 9f3f64ab4..f91dd300c 100644 --- a/pumpkin-world/src/item/item_registry.rs +++ b/pumpkin-world/src/item/item_registry.rs @@ -28,12 +28,12 @@ pub struct ItemElement { components: ItemComponents, } -#[allow(dead_code)] +#[expect(dead_code)] pub fn get_item_element(item_id: &str) -> &ItemComponents { &ITEMS.get(item_id).expect("Item not found").components } -#[allow(dead_code)] +#[expect(dead_code)] pub fn get_item_protocol_id(item_id: &str) -> u32 { global_registry::get_protocol_id(ITEM_REGISTRY, item_id) } diff --git a/pumpkin-world/src/level.rs b/pumpkin-world/src/level.rs index 9f3f9f403..aded912cd 100644 --- a/pumpkin-world/src/level.rs +++ b/pumpkin-world/src/level.rs @@ -26,7 +26,7 @@ pub struct Level { } struct SaveFile { - #[allow(dead_code)] + #[expect(dead_code)] root_folder: PathBuf, region_folder: PathBuf, } diff --git a/pumpkin-world/src/world_gen/seed.rs b/pumpkin-world/src/world_gen/seed.rs index a3245c2b6..884eb4a3d 100644 --- a/pumpkin-world/src/world_gen/seed.rs +++ b/pumpkin-world/src/world_gen/seed.rs @@ -1,6 +1,6 @@ use std::hash::{DefaultHasher, Hash, Hasher}; -#[allow(dead_code)] +#[expect(dead_code)] #[derive(Clone, Copy)] pub struct Seed(pub i64); diff --git a/pumpkin/src/client/authentication.rs b/pumpkin/src/client/authentication.rs index 0f1fc1e73..1320d934d 100644 --- a/pumpkin/src/client/authentication.rs +++ b/pumpkin/src/client/authentication.rs @@ -13,8 +13,8 @@ use uuid::Uuid; use crate::server::Server; #[derive(Deserialize, Clone, Debug)] -#[allow(non_snake_case)] -#[allow(dead_code)] +#[expect(non_snake_case)] +#[expect(dead_code)] pub struct ProfileTextures { timestamp: i64, profileId: Uuid, @@ -24,7 +24,7 @@ pub struct ProfileTextures { } #[derive(Deserialize, Clone, Debug)] -#[allow(dead_code)] +#[expect(dead_code)] pub struct Texture { url: String, metadata: Option>, diff --git a/pumpkin/src/commands/cmd_gamemode.rs b/pumpkin/src/commands/cmd_gamemode.rs index 17e47fea4..d7b25ecf5 100644 --- a/pumpkin/src/commands/cmd_gamemode.rs +++ b/pumpkin/src/commands/cmd_gamemode.rs @@ -72,7 +72,7 @@ pub(crate) fn init_command_tree<'a>() -> CommandTree<'a> { ))); } else { // TODO - #[allow(clippy::let_underscore_future)] + #[expect(clippy::let_underscore_future)] let _ = target.set_gamemode(gamemode); target.send_system_message(TextComponent::text(&format!( "Game mode was set to {:?}", @@ -97,7 +97,7 @@ pub(crate) fn init_command_tree<'a>() -> CommandTree<'a> { ))); } else { // TODO - #[allow(clippy::let_underscore_future)] + #[expect(clippy::let_underscore_future)] let _ = target.set_gamemode(gamemode); target.send_system_message(TextComponent::text(&format!( "Game mode was set to {:?}", diff --git a/pumpkin/src/commands/tree_builder.rs b/pumpkin/src/commands/tree_builder.rs index 338dc5f69..acb285259 100644 --- a/pumpkin/src/commands/tree_builder.rs +++ b/pumpkin/src/commands/tree_builder.rs @@ -131,7 +131,7 @@ impl<'a> NonLeafNodeBuilder<'a> { } /// Matches a sting literal. -#[allow(dead_code)] // todo: remove (so far no commands requiring this are implemented) +#[expect(dead_code)] // todo: remove (so far no commands requiring this are implemented) pub fn literal(string: &str) -> NonLeafNodeBuilder { NonLeafNodeBuilder { node_type: NodeType::Literal { string }, diff --git a/pumpkin/src/main.rs b/pumpkin/src/main.rs index d7cc89e62..3ac0c7840 100644 --- a/pumpkin/src/main.rs +++ b/pumpkin/src/main.rs @@ -1,4 +1,4 @@ -#![allow(clippy::await_holding_lock)] +#![expect(clippy::await_holding_lock)] #[cfg(target_os = "wasi")] compile_error!("Compiling for WASI targets is not supported!");