grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix warnings: mem::uninitialized

Browse Source
This commit is contained in:
adria0 2020-07-29 10:48:25 +02:00 committed by Artem Vorotnikov
parent 239cf91594
commit 0cd972326c
No known key found for this signature in database
GPG Key ID: E0148C3F2FBB7A20
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ethash/src/compute.rs
View File

@ -152,7 +152,7 @@ pub fn quick_get_difficulty(
// //
// This cannot be elided by the compiler as it doesn't know the implementation of // This cannot be elided by the compiler as it doesn't know the implementation of
// `keccak_512`. // `keccak_512`.
let mut buf: [u8; 64 + 32] = mem::uninitialized(); let mut buf: [u8; 64 + 32] = ::mem::MaybeUninit::uninit().assume_init();
ptr::copy_nonoverlapping(header_hash.as_ptr(), buf.as_mut_ptr(), 32); ptr::copy_nonoverlapping(header_hash.as_ptr(), buf.as_mut_ptr(), 32);
ptr::copy_nonoverlapping(&nonce as *const u64 as *const u8, buf[32..].as_mut_ptr(), 8); ptr::copy_nonoverlapping(&nonce as *const u64 as *const u8, buf[32..].as_mut_ptr(), 8);
@ -161,7 +161,7 @@ pub fn quick_get_difficulty(
ptr::copy_nonoverlapping(mix_hash.as_ptr(), buf[64..].as_mut_ptr(), 32); ptr::copy_nonoverlapping(mix_hash.as_ptr(), buf[64..].as_mut_ptr(), 32);
// This is initialized in `keccak_256` // This is initialized in `keccak_256`
let mut hash: [u8; 32] = mem::uninitialized(); let mut hash: [u8; 32] = ::mem::MaybeUninit::uninit().assume_init();
keccak_256::unchecked(hash.as_mut_ptr(), hash.len(), buf.as_ptr(), buf.len()); keccak_256::unchecked(hash.as_mut_ptr(), hash.len(), buf.as_ptr(), buf.len());
hash hash
@ -219,7 +219,7 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
// We explicitly write the first 40 bytes, leaving the last 24 as uninitialized. Then // We explicitly write the first 40 bytes, leaving the last 24 as uninitialized. Then
// `keccak_512` reads the first 40 bytes (4th parameter) and overwrites the entire array, // `keccak_512` reads the first 40 bytes (4th parameter) and overwrites the entire array,
// leaving it fully initialized. // leaving it fully initialized.
let mut out: [u8; NODE_BYTES] = mem::uninitialized(); let mut out: [u8; NODE_BYTES] = ::mem::MaybeUninit::uninit().assume_init();
ptr::copy_nonoverlapping(header_hash.as_ptr(), out.as_mut_ptr(), header_hash.len()); ptr::copy_nonoverlapping(header_hash.as_ptr(), out.as_mut_ptr(), header_hash.len());
ptr::copy_nonoverlapping( ptr::copy_nonoverlapping(
@ -239,7 +239,7 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
Node { bytes: out } Node { bytes: out }
}, },
// This is fully initialized before being read, see `let mut compress = ...` below // This is fully initialized before being read, see `let mut compress = ...` below
compress_bytes: unsafe { mem::uninitialized() }, compress_bytes: unsafe { ::mem::MaybeUninit::uninit().assume_init() },
}; };
let mut mix: [_; MIX_NODES] = [buf.half_mix.clone(), buf.half_mix.clone()]; let mut mix: [_; MIX_NODES] = [buf.half_mix.clone(), buf.half_mix.clone()];

2
ethash/src/shared.rs
View File

@ -82,7 +82,7 @@ macro_rules! static_assert_size_eq {
}; };
(@inner $a:ty, $b:ty) => { (@inner $a:ty, $b:ty) => {
unsafe { unsafe {
let val: $b = ::std::mem::uninitialized(); let val: $b = ::mem::MaybeUninit::uninit().assume_init();
let _: $a = ::std::mem::transmute(val); let _: $a = ::std::mem::transmute(val);
} }
}; };