diff --git a/base58/src/lib.rs b/base58/src/lib.rs index 38256b352..e9f3b8ec0 100644 --- a/base58/src/lib.rs +++ b/base58/src/lib.rs @@ -36,9 +36,9 @@ pub use alloc::{string::String, vec::Vec}; use core::fmt; #[cfg(feature = "std")] pub use std::{string::String, vec::Vec}; -use internals::array_vec::ArrayVec; use hashes::sha256d; +use internals::array_vec::ArrayVec; use crate::error::{IncorrectChecksumError, TooShortError}; @@ -127,10 +127,15 @@ pub fn encode(data: &[u8]) -> String { let reserve_len = encoded_reserve_len(data.len()); let mut res = String::with_capacity(reserve_len); if reserve_len <= SHORT_OPT_BUFFER_LEN { - format_iter(&mut res, data.iter().copied(), &mut ArrayVec::::new()) + format_iter( + &mut res, + data.iter().copied(), + &mut ArrayVec::::new(), + ) } else { format_iter(&mut res, data.iter().copied(), &mut Vec::with_capacity(reserve_len)) - }.expect("string doesn't error"); + } + .expect("string doesn't error"); res } @@ -179,34 +184,21 @@ trait Buffer: Sized { } impl Buffer for Vec { - fn push(&mut self, val: u8) { - Vec::push(self, val) - } + fn push(&mut self, val: u8) { Vec::push(self, val) } - fn slice(&self) -> &[u8] { - self - } + fn slice(&self) -> &[u8] { self } - fn slice_mut(&mut self) -> &mut [u8] { - self - } + fn slice_mut(&mut self) -> &mut [u8] { self } } impl Buffer for ArrayVec { - fn push(&mut self, val: u8) { - ArrayVec::push(self, val) - } + fn push(&mut self, val: u8) { ArrayVec::push(self, val) } - fn slice(&self) -> &[u8] { - self.as_slice() - } + fn slice(&self) -> &[u8] { self.as_slice() } - fn slice_mut(&mut self) -> &mut [u8] { - self.as_mut_slice() - } + fn slice_mut(&mut self) -> &mut [u8] { self.as_mut_slice() } } - fn format_iter(writer: &mut W, data: I, buf: &mut impl Buffer) -> Result<(), fmt::Error> where I: Iterator + Clone, diff --git a/bitcoin/src/blockdata/witness.rs b/bitcoin/src/blockdata/witness.rs index 512f972e5..82d6546f5 100644 --- a/bitcoin/src/blockdata/witness.rs +++ b/bitcoin/src/blockdata/witness.rs @@ -465,9 +465,7 @@ impl Witness { /// This does not guarantee that this represents a P2WS [`Witness`]. See /// [Script::is_p2wsh](crate::blockdata::script::Script::is_p2wsh) to /// check whether this is actually a P2WSH witness. - pub fn witness_script(&self) -> Option<&Script> { - self.last().map(Script::from_bytes) - } + pub fn witness_script(&self) -> Option<&Script> { self.last().map(Script::from_bytes) } } impl Index for Witness {