Make clippy happy

Author: koskja

feather/base/src/anvil/level.rs

@@ -149,7 +149,7 @@ pub struct SuperflatLayer {
 }
 
 /// The type of world generator for a level.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum LevelGeneratorType {
     Default,
     Flat,

feather/blocks/generator/src/load.rs

@@ -133,7 +133,7 @@ impl PropertyStore {
 
     fn update_name(name: &str) -> &str {
         match NAME_OVERRIDES.get(&name) {
-            Some(x) => *x,
+            Some(x) => x,
             None => name,
         }
     }

feather/common/src/block_break.rs

@@ -180,29 +180,16 @@ impl ActiveBreaker {
             .iter()
             .find_map(|(item, speed)| {
                 equipped_item
-                    .map(|e| {
-                        if e.item() == *item {
-                            Some(*speed)
-                        } else {
-                            None
-                        }
+                    .and_then(|e| {
+                        bool::then_some(e.item() == *item, *speed)
                     })
-                    .flatten()
             })
             .unwrap_or(1.0);
         let effi_level = equipped_item
-            .map(ItemStack::metadata)
-            .flatten()
-            .map(|meta| {
-                meta.enchantments().iter().find_map(|ench| {
-                    if ench.kind() == EnchantmentKind::Efficiency {
-                        Some(ench.level())
-                    } else {
-                        None
-                    }
-                })
-            })
-            .flatten();
+            .and_then(ItemStack::metadata)
+            .and_then(|meta| {
+                meta.get_enchantment_level(EnchantmentKind::Efficiency)
+            });
         let effi_speed = effi_level.map(|level| level * level + 1).unwrap_or(0) as f32;
         let damage = if harvestable {
             (dig_multiplier + effi_speed) / block.hardness() / 30.0

feather/datapacks/src/id.rs

@@ -32,7 +32,7 @@ impl NamespacedId {
 }
 
 /// Error returned when a namespaced ID was formatted incorrectly.
-#[derive(Debug, thiserror::Error, PartialEq)]
+#[derive(Debug, thiserror::Error, PartialEq, Eq)]
 pub enum ParseError {
     #[error("'{0}' is not a valid character for namespaces")]
     InvalidNamespaceChar(char),

feather/protocol/src/io.rs

@@ -480,7 +480,7 @@ impl<'a> Readable for LengthInferredVecU8<'a> {
 
 impl<'a> Writeable for LengthInferredVecU8<'a> {
     fn write(&self, buffer: &mut Vec<u8>, _version: ProtocolVersion) -> anyhow::Result<()> {
-        buffer.extend_from_slice(&*self.0);
+        buffer.extend_from_slice(&self.0);
         Ok(())
     }
 }

feather/server/src/initial_handler/proxy.rs

@@ -10,7 +10,7 @@ mod bungeecord;
 mod velocity;
 
 /// IP forwarding data received from the proxy.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub struct ProxyData {
     /// IP address of the proxy.
     pub host: String,

feather/server/src/packet_handlers/interaction.rs

@@ -134,7 +134,7 @@ pub fn handle_player_digging(
                 let hotbar_slot = game.ecs.get::<HotbarSlot>(player)?.get();
                 let main_hand = window.item(SLOT_HOTBAR_OFFSET + hotbar_slot)?;
                 *breaker = BlockBreaker::Active(
-                    ActiveBreaker::new(&mut game.world, packet.position, main_hand.item_stack())
+                    ActiveBreaker::new(&mut game.world, packet.position, main_hand.option_ref())
                         .unwrap(),
                 );
             }

feather/server/src/packet_handlers/inventory.rs

@@ -56,7 +56,7 @@ pub fn handle_click_window(
     }
     client.set_cursor_slot(window.cursor_item());
 
-    client.send_window_items(&*window);
+    client.send_window_items(&window);
 
     result
 }

libcraft/items/src/item_stack.rs

@@ -352,6 +352,7 @@ impl ItemStack {
         self.item.stack_size()
     }
 
+    #[must_use]
     pub fn metadata(&self) -> Option<&ItemStackMeta> {
         self.meta.as_ref()
     }
@@ -403,9 +404,11 @@ impl ItemStackMeta {
             self.enchantments.push(Enchantment::new(ench, level));
         }
     }
+    #[must_use]
     pub fn enchantments(&self) -> &[Enchantment] {
         &self.enchantments
     }
+    #[must_use]
     pub fn enchantments_mut(&mut self) -> &mut Vec<Enchantment> {
         &mut self.enchantments
     }

libcraft/text/src/text.rs

@@ -16,7 +16,7 @@ pub enum TextConversionError {
     InvalidStyle(String),
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum Color {
     DarkRed,
@@ -304,7 +304,7 @@ where
     }
 }
 
-impl<'a> From<&Translate> for String {
+impl From<&Translate> for String {
     fn from(translate: &Translate) -> Self {
         match translate {
             Translate::ChatTypeText => "chat.type.text",