Skip to content

fix: qualify Hash trait in macros for --no-default-features #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xdustinface merged 1 commit into from
Jan 1, 2026
Merged

fix: qualify Hash trait in macros for --no-default-features #313

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions hashes/src/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,9 @@ macro_rules! hash_newtype {
/// Reverses the bytes of the hash
#[allow(unused)]
pub fn reverse(&self) -> Self {
let mut reversed_bytes = self.0.to_byte_array();
let mut reversed_bytes = <$hash as $crate::Hash>::to_byte_array(self.0);
reversed_bytes.reverse();
Self::from_byte_array(reversed_bytes)
<Self as $crate::Hash>::from_byte_array(reversed_bytes)
}
}

Expand Down Expand Up @@ -275,17 +275,17 @@ macro_rules! hash_newtype {

#[inline]
fn to_byte_array(self) -> Self::Bytes {
self.0.to_byte_array()
<$hash as $crate::Hash>::to_byte_array(self.0)
}

#[inline]
fn as_byte_array(&self) -> &Self::Bytes {
self.0.as_byte_array()
<$hash as $crate::Hash>::as_byte_array(&self.0)
}

#[inline]
fn all_zeros() -> Self {
let zeros = <$hash>::all_zeros();
let zeros = <$hash as $crate::Hash>::all_zeros();
$newtype(zeros)
}
}
Expand All @@ -294,14 +294,13 @@ macro_rules! hash_newtype {
type Err = $crate::hex::Error;
fn from_str(s: &str) -> $crate::_export::_core::result::Result<$newtype, Self::Err> {
use $crate::hex::{HexIterator, FromHex};
use $crate::Hash;

let inner: <$hash as Hash>::Bytes = if <Self as $crate::Hash>::DISPLAY_BACKWARD {
let inner: <$hash as $crate::Hash>::Bytes = if <Self as $crate::Hash>::DISPLAY_BACKWARD {
FromHex::from_byte_iter(HexIterator::new(s)?.rev())?
} else {
FromHex::from_byte_iter(HexIterator::new(s)?)?
};
Ok($newtype(<$hash>::from_byte_array(inner)))
Ok($newtype(<$hash as $crate::Hash>::from_byte_array(inner)))
}
}

Expand All @@ -321,7 +320,7 @@ macro_rules! hash_newtype {
}

impl From<[u8; <$hash as $crate::Hash>::LEN]> for $newtype {
fn from(bytes: [u8; <$hash as Hash>::LEN]) -> Self {
fn from(bytes: [u8; <$hash as $crate::Hash>::LEN]) -> Self {
$newtype(<$hash as $crate::Hash>::from_byte_array(bytes))
}
}
Expand Down Expand Up @@ -410,17 +409,17 @@ macro_rules! hash_newtype_no_ord {

#[inline]
fn to_byte_array(self) -> Self::Bytes {
self.0.to_byte_array()
<$hash as $crate::Hash>::to_byte_array(self.0)
}

#[inline]
fn as_byte_array(&self) -> &Self::Bytes {
self.0.as_byte_array()
<$hash as $crate::Hash>::as_byte_array(&self.0)
}

#[inline]
fn all_zeros() -> Self {
let zeros = <$hash>::all_zeros();
let zeros = <$hash as $crate::Hash>::all_zeros();
$newtype(zeros)
}
}
Expand All @@ -429,14 +428,13 @@ macro_rules! hash_newtype_no_ord {
type Err = $crate::hex::Error;
fn from_str(s: &str) -> $crate::_export::_core::result::Result<$newtype, Self::Err> {
use $crate::hex::{HexIterator, FromHex};
use $crate::Hash;

let inner: <$hash as Hash>::Bytes = if <Self as $crate::Hash>::DISPLAY_BACKWARD {
let inner: <$hash as $crate::Hash>::Bytes = if <Self as $crate::Hash>::DISPLAY_BACKWARD {
FromHex::from_byte_iter(HexIterator::new(s)?.rev())?
} else {
FromHex::from_byte_iter(HexIterator::new(s)?)?
};
Ok($newtype(<$hash>::from_byte_array(inner)))
Ok($newtype(<$hash as $crate::Hash>::from_byte_array(inner)))
}
}

Expand All @@ -456,7 +454,7 @@ macro_rules! hash_newtype_no_ord {
}

impl From<[u8; <$hash as $crate::Hash>::LEN]> for $newtype {
fn from(bytes: [u8; <$hash as Hash>::LEN]) -> Self {
fn from(bytes: [u8; <$hash as $crate::Hash>::LEN]) -> Self {
$newtype(<$hash as $crate::Hash>::from_byte_array(bytes))
}
}
Expand Down