diff --git a/bitcoin/src/internal_macros.rs b/bitcoin/src/internal_macros.rs index 208dbb688..658b099df 100644 --- a/bitcoin/src/internal_macros.rs +++ b/bitcoin/src/internal_macros.rs @@ -33,9 +33,7 @@ macro_rules! impl_consensus_encoding { fn consensus_decode( r: &mut R, ) -> core::result::Result<$thing, $crate::consensus::encode::Error> { - use internals::ToU64 as _; - - let mut r = r.take($crate::consensus::encode::MAX_VEC_SIZE.to_u64()); + let mut r = r.take(internals::ToU64::to_u64($crate::consensus::encode::MAX_VEC_SIZE)); Ok($thing { $($field: $crate::consensus::Decodable::consensus_decode(&mut r)?),+ }) diff --git a/hashes/src/internal_macros.rs b/hashes/src/internal_macros.rs index ecb55d579..65e5ddb17 100644 --- a/hashes/src/internal_macros.rs +++ b/hashes/src/internal_macros.rs @@ -7,10 +7,8 @@ macro_rules! arr_newtype_fmt_impl { impl<$($gen: $gent),*> $crate::_export::_core::fmt::LowerHex for $ty<$($gen),*> { #[inline] fn fmt(&self, f: &mut $crate::_export::_core::fmt::Formatter) -> $crate::_export::_core::fmt::Result { - #[allow(unused)] - use crate::Hash as _; let case = $crate::hex::Case::Lower; - if <$ty<$($gen),*>>::DISPLAY_BACKWARD { + if <$ty<$($gen),*> as crate::Hash>::DISPLAY_BACKWARD { $crate::hex::fmt_hex_exact!(f, $bytes, self.0.iter().rev(), case) } else { $crate::hex::fmt_hex_exact!(f, $bytes, self.0.iter(), case) @@ -21,10 +19,8 @@ macro_rules! arr_newtype_fmt_impl { impl<$($gen: $gent),*> $crate::_export::_core::fmt::UpperHex for $ty<$($gen),*> { #[inline] fn fmt(&self, f: &mut $crate::_export::_core::fmt::Formatter) -> $crate::_export::_core::fmt::Result { - #[allow(unused)] - use crate::Hash as _; let case = $crate::hex::Case::Upper; - if <$ty<$($gen),*>>::DISPLAY_BACKWARD { + if <$ty<$($gen),*> as crate::Hash>::DISPLAY_BACKWARD { $crate::hex::fmt_hex_exact!(f, $bytes, self.0.iter().rev(), case) } else { $crate::hex::fmt_hex_exact!(f, $bytes, self.0.iter(), case) diff --git a/hashes/src/serde_macros.rs b/hashes/src/serde_macros.rs index 2782e961c..81d97eae4 100644 --- a/hashes/src/serde_macros.rs +++ b/hashes/src/serde_macros.rs @@ -112,9 +112,7 @@ macro_rules! serde_impl( impl<$($gen: $gent),*> $crate::serde_macros::serde_details::SerdeHash for $t<$($gen),*> { const N : usize = $len; fn from_slice_delegated(sl: &[u8]) -> core::result::Result { - #[allow(unused_imports)] - use $crate::Hash as _; - $t::from_slice(sl) + <$t<$($gen),*> as $crate::Hash>::from_slice(sl) } }