chore: refactor some match with same arms (alloy-rs#1463)

tcoratger · Oct 16, 2024 · e201df8 · e201df8
1 parent 881d15c
commit e201df8
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 34 deletions.
diff --git a/crates/eips/src/eip4844/sidecar.rs b/crates/eips/src/eip4844/sidecar.rs
@@ -340,11 +340,11 @@ pub enum BlobTransactionValidationError {
 impl std::error::Error for BlobTransactionValidationError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match self {
-            Self::InvalidProof { .. } => None,
             Self::KZGError(source) => Some(source),
-            Self::NotBlobTransaction { .. } => None,
-            Self::MissingSidecar { .. } => None,
-            Self::WrongVersionedHash { .. } => None,
+            Self::InvalidProof { .. }
+            | Self::NotBlobTransaction { .. }
+            | Self::MissingSidecar { .. }
+            | Self::WrongVersionedHash { .. } => None,
         }
     }
 }

diff --git a/crates/provider/src/layers/cache.rs b/crates/provider/src/layers/cache.rs
@@ -415,8 +415,7 @@ impl<Params: RpcParam> RequestType<Params> {
     const fn has_block_tag(&self) -> bool {
         if let Some(block_id) = self.block_id {
             match block_id {
-                BlockId::Hash(_) => return false,
-                BlockId::Number(BlockNumberOrTag::Number(_)) => return false,
+                BlockId::Hash(_) | BlockId::Number(BlockNumberOrTag::Number(_)) => return false,
                 _ => return true,
             }
         }

diff --git a/crates/pubsub/src/handle.rs b/crates/pubsub/src/handle.rs
@@ -79,8 +79,7 @@ impl ConnectionInterface {
     /// requests.
     pub async fn recv_from_frontend(&mut self) -> Option<Box<RawValue>> {
         match self.shutdown.try_recv() {
-            Ok(_) => return None,
-            Err(TryRecvError::Closed) => return None,
+            Ok(_) | Err(TryRecvError::Closed) => return None,
             Err(TryRecvError::Empty) => {}
         }
 

diff --git a/crates/rpc-types-engine/src/forkchoice.rs b/crates/rpc-types-engine/src/forkchoice.rs
@@ -99,16 +99,13 @@ impl From<ForkchoiceUpdateError> for jsonrpsee_types::error::ErrorObject<'static
                     None::<()>,
                 )
             }
-            ForkchoiceUpdateError::InvalidState => jsonrpsee_types::error::ErrorObject::owned(
-                INVALID_FORK_CHOICE_STATE_ERROR,
-                INVALID_FORK_CHOICE_STATE_ERROR_MSG,
-                None::<()>,
-            ),
-            ForkchoiceUpdateError::UnknownFinalBlock => jsonrpsee_types::error::ErrorObject::owned(
-                INVALID_FORK_CHOICE_STATE_ERROR,
-                INVALID_FORK_CHOICE_STATE_ERROR_MSG,
-                None::<()>,
-            ),
+            ForkchoiceUpdateError::InvalidState | ForkchoiceUpdateError::UnknownFinalBlock => {
+                jsonrpsee_types::error::ErrorObject::owned(
+                    INVALID_FORK_CHOICE_STATE_ERROR,
+                    INVALID_FORK_CHOICE_STATE_ERROR_MSG,
+                    None::<()>,
+                )
+            }
         }
     }
 }

diff --git a/crates/rpc-types-engine/src/jwt.rs b/crates/rpc-types-engine/src/jwt.rs
@@ -89,9 +89,9 @@ impl std::error::Error for JwtError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match self {
             Self::JwtSecretHexDecodeError(err) => Some(err),
-            Self::CreateDir { source, .. } => Some(source),
-            Self::Read { source, .. } => Some(source),
-            Self::Write { source, .. } => Some(source),
+            Self::CreateDir { source, .. }
+            | Self::Read { source, .. }
+            | Self::Write { source, .. } => Some(source),
             _ => None,
         }
     }

diff --git a/crates/rpc-types-eth/src/transaction/error.rs b/crates/rpc-types-eth/src/transaction/error.rs
@@ -80,11 +80,11 @@ impl std::error::Error for ConversionError {
         match self {
             Self::Eip2718Error(err) => Some(err),
             Self::SignatureError(err) => Some(err),
-            Self::BaseFeePerGasConversion(err) => Some(err),
-            Self::GasLimitConversion(err) => Some(err),
-            Self::GasUsedConversion(err) => Some(err),
-            Self::BlobGasUsedConversion(err) => Some(err),
-            Self::ExcessBlobGasConversion(err) => Some(err),
+            Self::BaseFeePerGasConversion(err)
+            | Self::GasLimitConversion(err)
+            | Self::GasUsedConversion(err)
+            | Self::BlobGasUsedConversion(err)
+            | Self::ExcessBlobGasConversion(err) => Some(err),
             _ => None,
         }
     }

diff --git a/crates/rpc-types-trace/src/common.rs b/crates/rpc-types-trace/src/common.rs
@@ -32,8 +32,7 @@ impl<Ok, Err> TraceResult<Ok, Err> {
     #[doc(alias = "transaction_hash")]
     pub const fn tx_hash(&self) -> Option<TxHash> {
         *match self {
-            Self::Success { tx_hash, .. } => tx_hash,
-            Self::Error { tx_hash, .. } => tx_hash,
+            Self::Success { tx_hash, .. } | Self::Error { tx_hash, .. } => tx_hash,
         }
     }
 

diff --git a/crates/rpc-types-txpool/src/txpool.rs b/crates/rpc-types-txpool/src/txpool.rs
@@ -54,9 +54,7 @@ impl Visitor<'_> for TxpoolInspectSummaryVisitor {
             return Err(de::Error::custom("invalid format for TxpoolInspectSummary: gas_price"));
         }
         let to = match addr_split[0] {
-            "" => None,
-            "0x" => None,
-            "contract creation" => None,
+            "" | "0x" | "contract creation" => None,
             addr => {
                 Some(Address::from_str(addr.trim_start_matches("0x")).map_err(de::Error::custom)?)
             }

diff --git a/crates/transport-ws/src/native.rs b/crates/transport-ws/src/native.rs
@@ -93,9 +93,7 @@ impl WsBackend<TungsteniteStream> {
                 error!("Received binary message, expected text");
                 Err(())
             }
-            Message::Ping(_) => Ok(()),
-            Message::Pong(_) => Ok(()),
-            Message::Frame(_) => Ok(()),
+            Message::Ping(_) | Message::Pong(_) | Message::Frame(_) => Ok(()),
         }
     }