chore: sort derives, derive Eq more (foundry-rs#161)

Author: DaniPopes

crates/artifacts/solc/src/ast/lowfidelity.rs

@@ -5,7 +5,7 @@ use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use std::{collections::BTreeMap, fmt, fmt::Write, str::FromStr};
 
 /// Represents the AST field in the solc output
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Ast {
     #[serde(rename = "absolutePath")]
     pub absolute_path: String,
@@ -24,7 +24,7 @@ pub struct Ast {
     pub other: BTreeMap<String, serde_json::Value>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Node {
     /// The node ID.
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -62,7 +62,7 @@ impl Node {
 /// Represents the source location of a node: `<start byte>:<length>:<source index>`.
 ///
 /// The `length` and `index` can be -1 which is represented as `None`
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct SourceLocation {
     pub start: usize,
     pub length: Option<usize>,
@@ -118,7 +118,7 @@ impl fmt::Display for SourceLocation {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum NodeType {
     // Expressions
     Assignment,

crates/artifacts/solc/src/ast/macros.rs

@@ -10,7 +10,7 @@ macro_rules! ast_node {
         }
     ) => {
         $(#[$struct_meta])*
-        #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+        #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
         #[serde(rename_all = "camelCase")]
         pub struct $name {
             pub id: usize,
@@ -88,7 +88,7 @@ macro_rules! stmt_node {
 /// The inner value of each variant is boxed since AST types are inherently recursive.
 macro_rules! node_group {
     ($group:ident; $( $name:ident ),* $(,)*) => {
-        #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+        #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
         #[serde(tag = "nodeType")]
         pub enum $group {
             $(

crates/artifacts/solc/src/ast/misc.rs

@@ -4,7 +4,7 @@ use std::{fmt, fmt::Write, str::FromStr};
 /// Represents the source location of a node: `<start byte>:<length>:<source index>`.
 ///
 /// The `start`, `length` and `index` can be -1 which is represented as `None`
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct SourceLocation {
     pub start: Option<usize>,
     pub length: Option<usize>,
@@ -66,7 +66,7 @@ impl fmt::Display for SourceLocation {
 }
 
 /// Function mutability specifier.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum StateMutability {
     Payable,
@@ -76,7 +76,7 @@ pub enum StateMutability {
 }
 
 /// Variable mutability specifier.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum Mutability {
     Mutable,
@@ -85,7 +85,7 @@ pub enum Mutability {
 }
 
 /// Storage location specifier.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum StorageLocation {
     Calldata,
@@ -95,7 +95,7 @@ pub enum StorageLocation {
 }
 
 /// Visibility specifier.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum Visibility {
     External,
@@ -105,7 +105,7 @@ pub enum Visibility {
 }
 
 /// A type description.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TypeDescriptions {
     pub type_identifier: Option<String>,

crates/artifacts/solc/src/ast/mod.rs

@@ -137,7 +137,7 @@ node_group! {
 }
 
 // TODO: Better name
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum BlockOrStatement {
     Statement(Statement),
@@ -188,7 +188,7 @@ ast_node!(
 );
 
 /// All Solidity contract kinds.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum ContractKind {
     /// A normal contract.
@@ -220,7 +220,7 @@ expr_node!(
 );
 
 /// Assignment operators.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum AssignmentOperator {
     /// Simple assignment (`=`)
     #[serde(rename = "=")]
@@ -270,7 +270,7 @@ ast_node!(
 );
 
 /// Binary operators.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum BinaryOperator {
     /// Addition (`+`)
     #[serde(rename = "+")]
@@ -353,7 +353,7 @@ expr_node!(
 );
 
 // TODO: Better name
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum ElementaryOrRawTypeName {
     /// An [ElementaryTypeName] node that describes the type.
@@ -387,7 +387,7 @@ expr_node!(
 );
 
 /// Function call kinds.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum FunctionCallKind {
     /// A regular function call.
@@ -448,7 +448,7 @@ expr_node!(
 );
 
 /// Literal kinds.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum LiteralKind {
     /// A boolean.
@@ -622,7 +622,7 @@ expr_node!(
 );
 
 /// Unary operators.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum UnaryOperator {
     /// Increment (`++`)
     #[serde(rename = "++")]
@@ -774,7 +774,7 @@ impl FunctionDefinition {
 }
 
 /// Function kinds.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum FunctionKind {
     /// A contract function.
@@ -875,7 +875,7 @@ ast_node!(
 );
 
 /// A reference to an external variable or slot in an inline assembly block.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ExternalInlineAssemblyReference {
     #[serde(with = "serde_helpers::display_from_str")]
@@ -892,7 +892,7 @@ pub struct ExternalInlineAssemblyReference {
 }
 
 /// An assembly reference suffix.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum AssemblyReferenceSuffix {
     /// The reference refers to a storage slot.
@@ -914,7 +914,7 @@ impl fmt::Display for AssemblyReferenceSuffix {
 }
 
 /// Inline assembly flags.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum InlineAssemblyFlag {
     #[serde(rename = "memory-safe")]
     MemorySafe,
@@ -983,7 +983,7 @@ ast_node!(
 );
 
 /// Modifier invocation kinds.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum ModifierInvocationKind {
     /// A regular modifier invocation.
@@ -1046,20 +1046,20 @@ ast_node!(
     }
 );
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum UsingForFunctionItem {
     Function(FunctionIdentifierPath),
     OverloadedOperator(OverloadedOperator),
 }
 
 /// A wrapper around [IdentifierPath] for the [UsingForDirective].
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct FunctionIdentifierPath {
     pub function: IdentifierPath,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct OverloadedOperator {
     pub definition: IdentifierPath,
     pub operator: String,
@@ -1082,7 +1082,7 @@ ast_node!(
 /// A symbol alias.
 ///
 /// Symbol aliases can be defined using the [ImportDirective].
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct SymbolAlias {
     pub foreign: Identifier,
     pub local: Option<String>,