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

Change some static assertions to debug_assert

This commit is contained in:
Steven Roose 2020-10-23 17:24:57 +01:00
parent cdb579c101
commit 5c04a059d5
No known key found for this signature in database
GPG Key ID: 2F2A88D7F8D68E87
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/consensus/encode.rs
View File

@ -249,7 +249,7 @@ macro_rules! decoder_fn {
($name:ident, $val_type:ty, $readfn:ident, $byte_len: expr) => { ($name:ident, $val_type:ty, $readfn:ident, $byte_len: expr) => {
#[inline] #[inline]
fn $name(&mut self) -> Result<$val_type, Error> { fn $name(&mut self) -> Result<$val_type, Error> {
assert_eq!(::std::mem::size_of::<$val_type>(), $byte_len); // size_of isn't a constfn in 1.22 debug_assert_eq!(::std::mem::size_of::<$val_type>(), $byte_len); // size_of isn't a constfn in 1.22
let mut val = [0; $byte_len]; let mut val = [0; $byte_len];
self.read_exact(&mut val[..]).map_err(Error::Io)?; self.read_exact(&mut val[..]).map_err(Error::Io)?;
Ok(endian::$readfn(&val)) Ok(endian::$readfn(&val))

4
src/util/endian.rs
View File

@ -28,7 +28,7 @@ macro_rules! define_be_to_array {
($name: ident, $type: ty, $byte_len: expr) => { ($name: ident, $type: ty, $byte_len: expr) => {
#[inline] #[inline]
pub fn $name(val: $type) -> [u8; $byte_len] { pub fn $name(val: $type) -> [u8; $byte_len] {
assert_eq!(::std::mem::size_of::<$type>(), $byte_len); // size_of isn't a constfn in 1.22 debug_assert_eq!(::std::mem::size_of::<$type>(), $byte_len); // size_of isn't a constfn in 1.22
let mut res = [0; $byte_len]; let mut res = [0; $byte_len];
for i in 0..$byte_len { for i in 0..$byte_len {
res[i] = ((val >> ($byte_len - i - 1)*8) & 0xff) as u8; res[i] = ((val >> ($byte_len - i - 1)*8) & 0xff) as u8;
@ -41,7 +41,7 @@ macro_rules! define_le_to_array {
($name: ident, $type: ty, $byte_len: expr) => { ($name: ident, $type: ty, $byte_len: expr) => {
#[inline] #[inline]
pub fn $name(val: $type) -> [u8; $byte_len] { pub fn $name(val: $type) -> [u8; $byte_len] {
assert_eq!(::std::mem::size_of::<$type>(), $byte_len); // size_of isn't a constfn in 1.22 debug_assert_eq!(::std::mem::size_of::<$type>(), $byte_len); // size_of isn't a constfn in 1.22
let mut res = [0; $byte_len]; let mut res = [0; $byte_len];
for i in 0..$byte_len { for i in 0..$byte_len {
res[i] = ((val >> i*8) & 0xff) as u8; res[i] = ((val >> i*8) & 0xff) as u8;