milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Swap around the fields in `sha256t::Hash` 

There's a restriction that for structs containing unsized types the
unsized type has to be the last field. `sha256t::Hash` is not an unsized
type but we are going to introduce a macro that will assume this order
to work equally well with both sized and unsized types. Thus we swap it
upfront here.
This commit is contained in:
Martin Habovstiak 2025-03-24 13:19:59 +01:00
parent 8ee088df74
commit bc6da1fe07
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hashes/src/sha256t/mod.rs
View File

@ -45,13 +45,13 @@ pub trait Tag {
/// Output of the SHA256t hash function. /// Output of the SHA256t hash function.
#[repr(transparent)] #[repr(transparent)]
pub struct Hash<T>([u8; 32], PhantomData<T>); pub struct Hash<T>(PhantomData<T>, [u8; 32]);
impl<T> Hash<T> impl<T> Hash<T>
where where
T: Tag, T: Tag,
{ {
const fn internal_new(arr: [u8; 32]) -> Self { Hash(arr, PhantomData) } const fn internal_new(arr: [u8; 32]) -> Self { Hash(PhantomData, arr) }
/// Constructs a new hash from the underlying byte array. /// Constructs a new hash from the underlying byte array.
pub const fn from_byte_array(bytes: [u8; 32]) -> Self { Self::internal_new(bytes) } pub const fn from_byte_array(bytes: [u8; 32]) -> Self { Self::internal_new(bytes) }
@ -117,10 +117,10 @@ where
} }
/// Returns the underlying byte array. /// Returns the underlying byte array.
pub const fn to_byte_array(self) -> [u8; 32] { self.0 } pub const fn to_byte_array(self) -> [u8; 32] { self.1 }
/// Returns a reference to the underlying byte array. /// Returns a reference to the underlying byte array.
pub const fn as_byte_array(&self) -> &[u8; 32] { &self.0 } pub const fn as_byte_array(&self) -> &[u8; 32] { &self.1 }
} }
impl<T: Tag> Copy for Hash<T> {} impl<T: Tag> Copy for Hash<T> {}