diff --git a/bitcoin/src/merkle_tree/block.rs b/bitcoin/src/merkle_tree/block.rs index 0c9572ac23..4df0411528 100644 --- a/bitcoin/src/merkle_tree/block.rs +++ b/bitcoin/src/merkle_tree/block.rs @@ -530,11 +530,12 @@ impl<'a> Arbitrary<'a> for MerkleBlock { #[cfg(test)] mod tests { - use hex::{DisplayHex, FromHex}; - use hex_lit::hex; #[cfg(feature = "std")] use core::cmp; + use hex::{DisplayHex, FromHex}; + use hex_lit::hex; + use super::*; use crate::block::Unchecked; use crate::consensus::encode; @@ -555,11 +556,7 @@ mod tests { const P: usize = 1039; const Q: usize = 677; - const fn new(seed: usize) -> Self { - Self { - state: seed - } - } + const fn new(seed: usize) -> Self { Self { state: seed } } #[inline] fn next_usize(&mut self) -> usize { @@ -568,14 +565,10 @@ mod tests { } #[inline] - fn next_in_range(&mut self, max: usize) -> usize { - self.next_usize() % max - } + fn next_in_range(&mut self, max: usize) -> usize { self.next_usize() % max } #[inline] - fn next_u8(&mut self) -> u8 { - self.next_usize().to_le_bytes()[0] - } + fn next_u8(&mut self) -> u8 { self.next_usize().to_le_bytes()[0] } } #[cfg(feature = "std")] diff --git a/consensus_encoding/src/decode/decoders.rs b/consensus_encoding/src/decode/decoders.rs index 06abed3d2d..4ce64b02d0 100644 --- a/consensus_encoding/src/decode/decoders.rs +++ b/consensus_encoding/src/decode/decoders.rs @@ -78,7 +78,8 @@ impl Decoder for ByteVecDecoder { type Error = ByteVecDecoderError; fn push_bytes(&mut self, bytes: &mut &[u8]) -> Result { - use {ByteVecDecoderError as E, ByteVecDecoderErrorInner as Inner}; + use ByteVecDecoderError as E; + use ByteVecDecoderErrorInner as Inner; if let Some(mut decoder) = self.prefix_decoder.take() { if decoder.push_bytes(bytes).map_err(|e| E(Inner::LengthPrefixDecode(e)))? { @@ -106,7 +107,8 @@ impl Decoder for ByteVecDecoder { } fn end(self) -> Result { - use {ByteVecDecoderError as E, ByteVecDecoderErrorInner as Inner}; + use ByteVecDecoderError as E; + use ByteVecDecoderErrorInner as Inner; if let Some(ref prefix_decoder) = self.prefix_decoder { return Err(E(Inner::UnexpectedEof(UnexpectedEofError { @@ -189,7 +191,8 @@ impl Decoder for VecDecoder { type Error = VecDecoderError<<::Decoder as Decoder>::Error>; fn push_bytes(&mut self, bytes: &mut &[u8]) -> Result { - use {VecDecoderError as E, VecDecoderErrorInner as Inner}; + use VecDecoderError as E; + use VecDecoderErrorInner as Inner; if let Some(mut decoder) = self.prefix_decoder.take() { if decoder.push_bytes(bytes).map_err(|e| E(Inner::LengthPrefixDecode(e)))? { diff --git a/network/src/lib.rs b/network/src/lib.rs index 0987d808bd..14a7eb5db3 100644 --- a/network/src/lib.rs +++ b/network/src/lib.rs @@ -197,7 +197,7 @@ pub mod as_core_arg { #![allow(clippy::missing_errors_doc)] use crate::Network; - + #[allow(clippy::trivially_copy_pass_by_ref)] // `serde` controls the API. pub fn serialize(network: &Network, serializer: S) -> Result where diff --git a/primitives/src/transaction.rs b/primitives/src/transaction.rs index 60fddd81da..dacf9e646a 100644 --- a/primitives/src/transaction.rs +++ b/primitives/src/transaction.rs @@ -449,10 +449,9 @@ impl Decoder for TransactionDecoder { #[inline] fn push_bytes(&mut self, bytes: &mut &[u8]) -> Result { - use { - TransactionDecoderError as E, TransactionDecoderErrorInner as Inner, - TransactionDecoderState as State, - }; + use TransactionDecoderError as E; + use TransactionDecoderErrorInner as Inner; + use TransactionDecoderState as State; loop { // Attempt to push to the currently-active decoder and return early on success. @@ -575,10 +574,9 @@ impl Decoder for TransactionDecoder { #[inline] fn end(self) -> Result { - use { - TransactionDecoderError as E, TransactionDecoderErrorInner as Inner, - TransactionDecoderState as State, - }; + use TransactionDecoderError as E; + use TransactionDecoderErrorInner as Inner; + use TransactionDecoderState as State; match self.state { State::Version(_) => Err(E(Inner::EarlyEnd("version"))), diff --git a/primitives/src/witness.rs b/primitives/src/witness.rs index 33166416fe..343fe197ed 100644 --- a/primitives/src/witness.rs +++ b/primitives/src/witness.rs @@ -337,7 +337,8 @@ impl Decoder for WitnessDecoder { type Error = WitnessDecoderError; fn push_bytes(&mut self, bytes: &mut &[u8]) -> Result { - use {WitnessDecoderError as E, WitnessDecoderErrorInner as Inner}; + use WitnessDecoderError as E; + use WitnessDecoderErrorInner as Inner; // Read initial witness element count. if self.witness_elements.is_none() { @@ -445,7 +446,8 @@ impl Decoder for WitnessDecoder { } fn end(mut self) -> Result { - use {WitnessDecoderError as E, WitnessDecoderErrorInner as Inner}; + use WitnessDecoderError as E; + use WitnessDecoderErrorInner as Inner; let Some(witness_elements) = self.witness_elements else { // Never read the witness element count.