Clippy cleanup

wkennedy · Nov 13, 2023 · 37a74c8 · 37a74c8
1 parent f2d121e
commit 37a74c8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/borsh-serde-adapter/src/deserialize_adapter.rs b/borsh-serde-adapter/src/deserialize_adapter.rs
@@ -39,9 +39,9 @@ fn deserialize_to_serde_json(buffer: &mut &[u8], schema: &BorshSchemaContainer,
             if let Some(d) = schema.get_definition(declaration) {
                 match d {
                     Definition::Primitive { .. } => {
-                        let value = deserialize_to_serde_json(buffer, schema, &declaration)?;
+                        let value = deserialize_to_serde_json(buffer, schema, declaration)?;
 
-                        Ok(value.into())
+                        Ok(value)
                     }
 
                     //TODO cleanup
@@ -54,9 +54,9 @@ fn deserialize_to_serde_json(buffer: &mut &[u8], schema: &BorshSchemaContainer,
                             length = u32::deserialize(buffer)? as usize;
                         };
 
-                        let mut values = Vec::<serde_json::Value>::with_capacity(length as usize);
+                        let mut values = Vec::<serde_json::Value>::with_capacity(length);
                         for _ in 0..length {
-                            let value = deserialize_to_serde_json(buffer, schema, &elements)?;
+                            let value = deserialize_to_serde_json(buffer, schema, elements)?;
                             values.push(value);
                         }
                         Ok(values.into())
@@ -65,15 +65,15 @@ fn deserialize_to_serde_json(buffer: &mut &[u8], schema: &BorshSchemaContainer,
                     Definition::Tuple { elements } => {
                         let mut values = Vec::<serde_json::Value>::with_capacity(elements.len());
                         for element in elements {
-                            let value = deserialize_to_serde_json(buffer, schema, &element)?;
+                            let value = deserialize_to_serde_json(buffer, schema, element)?;
                             values.push(value);
                         }
                         Ok(values.into())
                     }
 
-                    Definition::Enum { tag_width, variants } => {
+                    Definition::Enum { tag_width: _, variants } => {
                         let variant_index = u8::deserialize(buffer)?;
-                        let (dicriminator_value, variant_name, variant_declaration) = &variants[variant_index as usize];
+                        let (_dicriminator_value, variant_name, variant_declaration) = &variants[variant_index as usize];
                         deserialize_to_serde_json(buffer, schema, variant_declaration)
                             .map(|value| json!({ variant_name: value }))
                     }
@@ -85,7 +85,7 @@ fn deserialize_to_serde_json(buffer: &mut &[u8], schema: &BorshSchemaContainer,
                                 let value = deserialize_to_serde_json(
                                     buffer,
                                     schema,
-                                    &value_declaration,
+                                    value_declaration,
                                 )?;
                                 object.insert(key.to_string(), value);
                             }
@@ -95,7 +95,7 @@ fn deserialize_to_serde_json(buffer: &mut &[u8], schema: &BorshSchemaContainer,
                         Fields::UnnamedFields(elements) => {
                             let mut values = Vec::<serde_json::Value>::with_capacity(elements.len());
                             for element in elements {
-                                let value = deserialize_to_serde_json(buffer, schema, &element)?;
+                                let value = deserialize_to_serde_json(buffer, schema, element)?;
                                 values.push(value);
                             }
                             Ok(values.into())
@@ -114,5 +114,5 @@ fn deserialize_to_serde_json(buffer: &mut &[u8], schema: &BorshSchemaContainer,
 
 /// Deserializes borsh serialized bytes to serde_json::Value using the provided schema
 pub fn deserialize_from_schema(buffer: &mut &[u8], schema: &BorshSchemaContainer) -> std::io::Result<serde_json::Value> {
-    deserialize_to_serde_json(buffer, schema, &schema.declaration())
+    deserialize_to_serde_json(buffer, schema, schema.declaration())
 }
diff --git a/borsh-serde-adapter/src/serialize_adapter.rs b/borsh-serde-adapter/src/serialize_adapter.rs
@@ -10,7 +10,7 @@ use crate::errors::ExpectationError;
 
 /// Serializes serde_json::Value to borsh serialized bytes using the provided schema
 pub fn serialize_serde_json_to_borsh(writer: &mut impl Write, value: &serde_json::Value, schema: &BorshSchemaContainer) -> anyhow::Result<()> {
-    serialize_serde_json_by_declaration_with_schema(writer, value, schema, &schema.declaration())
+    serialize_serde_json_by_declaration_with_schema(writer, value, schema, schema.declaration())
 }
 
 fn serialize_signed_to_borsh<T: BorshSerialize + TryFrom<i64>>(writer: &mut impl Write, value: &serde_json::Value) -> anyhow::Result<()>
@@ -82,7 +82,7 @@ fn serialize_serde_json_by_declaration_with_schema(
                 match definition {
 
                     Definition::Primitive { .. } => {
-                        serialize_serde_json_by_declaration_with_schema(writer, value, schema, &declaration)?;
+                        serialize_serde_json_by_declaration_with_schema(writer, value, schema, declaration)?;
                         Ok(())
                     }
 
@@ -99,7 +99,7 @@ fn serialize_serde_json_by_declaration_with_schema(
                             BorshSerialize::serialize(&(length as u32), writer)?;
                         };
                         for item in sequence {
-                            serialize_serde_json_by_declaration_with_schema(writer, item, schema, &elements)?;
+                            serialize_serde_json_by_declaration_with_schema(writer, item, schema, elements)?;
                         }
                         Ok(())
                     }
@@ -157,7 +157,7 @@ fn serialize_serde_json_by_declaration_with_schema(
                                     writer,
                                     property_value,
                                     schema,
-                                    &value_declaration,
+                                    value_declaration,
                                 )?;
                             }
                             Ok(())