clippy

3 files changed, 15 insertions, 20 deletions

diff --git a/azalea-block/azalea-block-macros/src/lib.rs b/azalea-block/azalea-block-macros/src/lib.rs
index 3c9f3230..3e8ccf7d 100644
--- a/azalea-block/azalea-block-macros/src/lib.rs
+++ b/azalea-block/azalea-block-macros/src/lib.rs
@@ -287,7 +287,7 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
                         _ => None,
                     })
                     .unwrap();
-                if property_default_ident.to_string() != variant.ident.to_string() {
+                if variant.ident != property_default_ident {
                     is_default = false;
                 }
 
diff --git a/azalea-block/azalea-block-macros/src/property/generate.rs b/azalea-block/azalea-block-macros/src/property/generate.rs
index 531fdc76..1af9b073 100644
--- a/azalea-block/azalea-block-macros/src/property/generate.rs
+++ b/azalea-block/azalea-block-macros/src/property/generate.rs
@@ -42,8 +42,7 @@ fn generate_property_code(
             let mut property_enum_variants = quote! {};
             let mut property_from_number_variants = quote! {};
 
-            for i in 0..variants.len() {
-                let variant = &variants[i];
+            for (i, variant) in variants.iter().enumerate() {
                 let variant_str = variant.name.value();
                 let variant_ident = variant.ident.clone();
                 let i_lit = Lit::Int(LitInt::new(&i.to_string(), proc_macro2::Span::call_site()));
@@ -103,9 +102,9 @@ fn generate_property_code(
         .get(&property_struct_name.to_string())
         .expect("Property values not found for property");
 
-    let try_from_block_state = generate_try_from_block_state(&property_values, last_state_id);
+    let try_from_block_state = generate_try_from_block_state(property_values, last_state_id);
 
-    let value_tokens = match get_property_kind(&property_values) {
+    let value_tokens = match get_property_kind(property_values) {
         PropertyKind::Enum => quote! { Self },
         PropertyKind::Bool => quote! { bool },
     };
@@ -239,8 +238,8 @@ pub fn get_property_variant_types(data: &PropertyData) -> Vec<PropertyVariantMet
         PropertyData::Enum { variants, .. } => {
             let mut property_variant_types = Vec::new();
 
-            for index in 0..variants.len() {
-                let variant_ident = variants[index].ident.clone();
+            for (index, variant) in variants.iter().enumerate() {
+                let variant_ident = variant.ident.clone();
                 property_variant_types.push(PropertyVariantMeta {
                     ident: variant_ident,
                     index,
@@ -285,16 +284,13 @@ pub fn make_property_struct_names_to_names(
     let mut property_struct_names_to_names = HashMap::new();
 
     for property in properties {
-        match &property.data {
-            PropertyData::Enum { enum_name, .. } => {
-                let property_struct_name = enum_name.clone();
-
-                property_struct_names_to_names.insert(
-                    property_struct_name.to_string(),
-                    property.name.clone().value(),
-                );
-            }
-            _ => {}
+        if let PropertyData::Enum { enum_name, .. } = &property.data {
+            let property_struct_name = enum_name.clone();
+
+            property_struct_names_to_names.insert(
+                property_struct_name.to_string(),
+                property.name.clone().value(),
+            );
         }
     }
 
diff --git a/azalea-block/src/lib.rs b/azalea-block/src/lib.rs
index aa6d5dba..2cab022e 100644
--- a/azalea-block/src/lib.rs
+++ b/azalea-block/src/lib.rs
@@ -75,10 +75,9 @@ mod tests {
         };
         let block_state = block.as_block_state();
         let block_from_state = Box::<dyn BlockTrait>::from(block_state);
-        let block_from_state = block_from_state
+        let block_from_state = *block_from_state
             .downcast_ref::<crate::blocks::OakTrapdoor>()
-            .unwrap()
-            .clone();
+            .unwrap();
         assert_eq!(block, block_from_state);
     }