diff --git a/bin/reth-bench/src/bench/replay_payloads.rs b/bin/reth-bench/src/bench/replay_payloads.rs index 48c0d4de760..7dfeb6d8fcc 100644 --- a/bin/reth-bench/src/bench/replay_payloads.rs +++ b/bin/reth-bench/src/bench/replay_payloads.rs @@ -450,12 +450,11 @@ impl Command { let name_str = name.to_string_lossy(); let index = if let Some(rest) = name_str.strip_prefix("payload_block_") { rest.strip_suffix(".json")?.parse::().ok()? - } else if let Some(rest) = name_str.strip_prefix("big_block_") { + } else { + let rest = name_str.strip_prefix("big_block_")?; // "big_block_FROM_to_TO.json" — use FROM as the index let rest = rest.strip_suffix(".json")?; rest.split("_to_").next()?.parse::().ok()? - } else { - return None; }; Some((index, e.path())) }) diff --git a/crates/net/discv5/src/lib.rs b/crates/net/discv5/src/lib.rs index f08a16b8df7..fabed02f749 100644 --- a/crates/net/discv5/src/lib.rs +++ b/crates/net/discv5/src/lib.rs @@ -248,7 +248,7 @@ impl Discv5 { discv5::Event::SocketUpdated(_) | discv5::Event::TalkRequest(_) | // `Discovered` not unique discovered peers discv5::Event::Discovered(_) => None, - discv5::Event::NodeInserted { replaced: _, .. } => { + discv5::Event::NodeInserted { .. } => { // node has been inserted into kbuckets diff --git a/crates/rpc/rpc-convert/src/transaction.rs b/crates/rpc/rpc-convert/src/transaction.rs index 0067f6bcb0b..980fbeca24f 100644 --- a/crates/rpc/rpc-convert/src/transaction.rs +++ b/crates/rpc/rpc-convert/src/transaction.rs @@ -479,7 +479,6 @@ impl evm, sim_tx_converter, rpc_tx_converter, - tx_env_converter: _, .. } = self; RpcConverter { diff --git a/crates/transaction-pool/src/traits.rs b/crates/transaction-pool/src/traits.rs index b2494f8a673..b0e12f1878e 100644 --- a/crates/transaction-pool/src/traits.rs +++ b/crates/transaction-pool/src/traits.rs @@ -1801,13 +1801,9 @@ impl NewSubpoolTransactionStream { &mut self, ) -> Result, tokio::sync::mpsc::error::TryRecvError> { loop { - match self.st.try_recv() { - Ok(event) => { - if event.subpool == self.subpool { - return Ok(event) - } - } - Err(e) => return Err(e), + let event = self.st.try_recv()?; + if event.subpool == self.subpool { + return Ok(event) } } }