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

hashes: remove private `internal_new` method 

This method is used to implement `from_byte_array`. But there is no need
for the method to exist. We can just inline it in `from_byte_array` and
reduce the amount of indirection in our macros.

Also make the same change in sha256t.
This commit is contained in:
Andrew Poelstra 2025-05-05 16:22:58 +00:00
parent 0aeff359f5
commit a5d96ceb39
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hashes/src/internal_macros.rs
View File

@ -130,12 +130,8 @@ macro_rules! hash_type_no_default {
} }
impl Hash { impl Hash {
const fn internal_new(arr: [u8; $bits / 8]) -> Self { Hash(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; $bits / 8]) -> Self { pub const fn from_byte_array(bytes: [u8; $bits / 8]) -> Self { Hash(bytes) }
Self::internal_new(bytes)
}
/// Copies a byte slice into a hash object. /// Copies a byte slice into a hash object.
#[deprecated(since = "0.15.0", note = "use `from_byte_array` instead")] #[deprecated(since = "0.15.0", note = "use `from_byte_array` instead")]
@ -151,7 +147,7 @@ macro_rules! hash_type_no_default {
} else { } else {
let mut ret = [0; $bits / 8]; let mut ret = [0; $bits / 8];
ret.copy_from_slice(sl); ret.copy_from_slice(sl);
Ok(Self::internal_new(ret)) Ok(Self::from_byte_array(ret))
} }
} }

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

@ -62,10 +62,8 @@ impl<T> Hash<T>
where where
T: Tag, T: Tag,
{ {
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(PhantomData, bytes) }
/// Copies a byte slice into a hash object. /// Copies a byte slice into a hash object.
#[deprecated(since = "0.15.0", note = "use `from_byte_array` instead")] #[deprecated(since = "0.15.0", note = "use `from_byte_array` instead")]