diff --git a/bitcoin/src/blockdata/script/instruction.rs b/bitcoin/src/blockdata/script/instruction.rs index 23c0083d4..bb8ab5408 100644 --- a/bitcoin/src/blockdata/script/instruction.rs +++ b/bitcoin/src/blockdata/script/instruction.rs @@ -2,9 +2,7 @@ use internals::script::{self, PushDataLenLen}; -use super::{ - Error, PushBytes, Script, ScriptBuf, ScriptBufExtPriv as _, -}; +use super::{Error, PushBytes, Script, ScriptBuf, ScriptBufExtPriv as _}; use crate::opcodes::{self, Opcode}; /// A "parsed opcode" which allows iterating over a [`Script`] in a more sensible way. diff --git a/bitcoin/src/blockdata/script/mod.rs b/bitcoin/src/blockdata/script/mod.rs index c0df71c0b..b6c07dbc5 100644 --- a/bitcoin/src/blockdata/script/mod.rs +++ b/bitcoin/src/blockdata/script/mod.rs @@ -65,7 +65,7 @@ use core::fmt; use core::ops::{Deref, DerefMut}; use hashes::{hash160, sha256}; -use internals::{impl_to_hex_from_lower_hex}; +use internals::impl_to_hex_from_lower_hex; use internals::script::{self, PushDataLenLen}; use io::{BufRead, Write}; @@ -643,15 +643,13 @@ pub(super) fn bytes_to_asm_fmt(script: &[u8], f: &mut dyn fmt::Write) -> fmt::Re macro_rules! read_push_data_len { ($iter:expr, $size:path, $formatter:expr) => { match script::read_push_data_len($iter, $size) { - Ok(n) => { - n - }, + Ok(n) => n, Err(_) => { $formatter.write_str("")?; break; } } - } + }; } let mut iter = script.iter(); diff --git a/bitcoin/src/blockdata/script/tests.rs b/bitcoin/src/blockdata/script/tests.rs index 7fdc91553..24d774fbb 100644 --- a/bitcoin/src/blockdata/script/tests.rs +++ b/bitcoin/src/blockdata/script/tests.rs @@ -497,19 +497,10 @@ fn script_asm() { "OP_0 OP_PUSHBYTES_71 304402202457e78cc1b7f50d0543863c27de75d07982bde8359b9e3316adec0aec165f2f02200203fd331c4e4a4a02f48cf1c291e2c0d6b2f7078a784b5b3649fca41f8794d401 OP_0 OP_PUSHDATA1 552103244e602b46755f24327142a0517288cebd159eccb6ccf41ea6edf1f601e9af952103bbbacc302d19d29dbfa62d23f37944ae19853cf260c745c2bea739c95328fcb721039227e83246bd51140fe93538b2301c9048be82ef2fb3c7fc5d78426ed6f609ad210229bf310c379b90033e2ecb07f77ecf9b8d59acb623ab7be25a0caed539e2e6472103703e2ed676936f10b3ce9149fa2d4a32060fb86fa9a70a4efe3f21d7ab90611921031e9b7c6022400a6bb0424bbcde14cff6c016b91ee3803926f3440abf5c146d05210334667f975f55a8455d515a2ef1c94fdfa3315f12319a14515d2a13d82831f62f57ae"); // Various weird scripts found in transaction 6d7ed9914625c73c0288694a6819196a27ef6c08f98e1270d975a8e65a3dc09a // which triggerred overflow bugs on 32-bit machines in script formatting in the past. - assert_eq!( - ScriptBuf::from_hex("01").unwrap().to_string(), - "OP_PUSHBYTES_1 " - ); - assert_eq!( - ScriptBuf::from_hex("0201").unwrap().to_string(), - "OP_PUSHBYTES_2 " - ); + assert_eq!(ScriptBuf::from_hex("01").unwrap().to_string(), "OP_PUSHBYTES_1 "); + assert_eq!(ScriptBuf::from_hex("0201").unwrap().to_string(), "OP_PUSHBYTES_2 "); assert_eq!(ScriptBuf::from_hex("4c").unwrap().to_string(), ""); - assert_eq!( - ScriptBuf::from_hex("4c0201").unwrap().to_string(), - "OP_PUSHDATA1 " - ); + assert_eq!(ScriptBuf::from_hex("4c0201").unwrap().to_string(), "OP_PUSHDATA1 "); assert_eq!(ScriptBuf::from_hex("4d").unwrap().to_string(), ""); assert_eq!( ScriptBuf::from_hex("4dffff01").unwrap().to_string(), diff --git a/bitcoin/src/blockdata/script/witness_program.rs b/bitcoin/src/blockdata/script/witness_program.rs index 8b705c14d..73f4a3e3a 100644 --- a/bitcoin/src/blockdata/script/witness_program.rs +++ b/bitcoin/src/blockdata/script/witness_program.rs @@ -190,11 +190,11 @@ mod tests { if size == 20 { assert!(program.expect("valid witness program").is_p2wpkh()); - continue + continue; } if size == 32 { assert!(program.expect("valid witness program").is_p2wsh()); - continue + continue; } assert!(program.is_err()); } @@ -203,6 +203,8 @@ mod tests { #[test] fn valid_v1_witness_programs() { let arbitrary_bytes = [0x00; 32]; - assert!(WitnessProgram::new(WitnessVersion::V1, &arbitrary_bytes).expect("valid witness program").is_p2tr()); + assert!(WitnessProgram::new(WitnessVersion::V1, &arbitrary_bytes) + .expect("valid witness program") + .is_p2tr()); } } diff --git a/bitcoin/src/blockdata/witness.rs b/bitcoin/src/blockdata/witness.rs index 6c87168f8..98a5c4771 100644 --- a/bitcoin/src/blockdata/witness.rs +++ b/bitcoin/src/blockdata/witness.rs @@ -275,9 +275,7 @@ impl Witness { let index_size = witness_elements * 4; let content_size = slice .iter() - .map(|elem| { - elem.as_ref().len() + compact_size::encoded_size(elem.as_ref().len()) - }) + .map(|elem| elem.as_ref().len() + compact_size::encoded_size(elem.as_ref().len())) .sum(); let mut content = vec![0u8; content_size + index_size]; diff --git a/hashes/src/siphash24.rs b/hashes/src/siphash24.rs index aaafc2d0f..f842bd9ce 100644 --- a/hashes/src/siphash24.rs +++ b/hashes/src/siphash24.rs @@ -53,7 +53,11 @@ macro_rules! compress { macro_rules! load_int_le { ($buf:expr, $i:expr, $int_ty:ident) => {{ debug_assert!($i + mem::size_of::<$int_ty>() <= $buf.len()); - $int_ty::from_le_bytes($buf.get_unchecked($i..($i + mem::size_of::<$int_ty>())).try_into().expect("len is correctly computed using size_of")) + $int_ty::from_le_bytes( + $buf.get_unchecked($i..($i + mem::size_of::<$int_ty>())) + .try_into() + .expect("len is correctly computed using size_of"), + ) }}; } diff --git a/hashes/tests/io.rs b/hashes/tests/io.rs index 66d21b030..ffaa80678 100644 --- a/hashes/tests/io.rs +++ b/hashes/tests/io.rs @@ -4,10 +4,12 @@ #![cfg(feature = "bitcoin-io")] +use bitcoin_hashes::{ + hash160, hmac, ripemd160, sha1, sha256, sha256d, sha384, sha512, sha512_256, siphash24, + GeneralHash as _, +}; use bitcoin_io::Write; -use bitcoin_hashes::{hash160, hmac, ripemd160, sha1, sha256, sha256d, sha384, sha512, sha512_256, siphash24, GeneralHash as _}; - macro_rules! write_test { ($mod:ident, $exp_empty:expr, $exp_256:expr, $exp_64k:expr,) => { #[test] @@ -124,4 +126,3 @@ fn siphash24() { engine.write_all(&[99; 64000]).unwrap(); assert_eq!(format!("{}", siphash24::Hash::from_engine(engine)), "ce456e4e4ecbc5bf"); } - diff --git a/units/src/amount.rs b/units/src/amount.rs index a305a5030..3b77420bb 100644 --- a/units/src/amount.rs +++ b/units/src/amount.rs @@ -1167,10 +1167,10 @@ impl FromStr for Amount { if d == Ok(Amount::ZERO) { Ok(Amount::ZERO) } else { - result + result } - }, - _ => result + } + _ => result, } } } @@ -1605,10 +1605,10 @@ impl FromStr for SignedAmount { if d == Ok(SignedAmount::ZERO) { Ok(SignedAmount::ZERO) } else { - result + result } - }, - _ => result + } + _ => result, } } }