Skip to content
Merged
Changes from all commits
Commits
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
33 changes: 20 additions & 13 deletions src/murmur3.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use core::{mem, slice};
use core::slice;
use core::mem::MaybeUninit;

use byteorder::{ByteOrder, LE};

Expand All @@ -17,7 +18,7 @@ struct State(u32);
#[derive(Clone, Copy)]
#[repr(align(4))]
struct Buffer {
bytes: [u8; 4],
bytes: MaybeUninit<[u8; 4]>,
}

#[derive(Clone, Copy, PartialEq)]
Expand Down Expand Up @@ -59,7 +60,7 @@ impl Hasher {
// self.buf.bytes[start..start+len].copy_from(buf);
for i in 0..len {
unsafe {
*self.buf.bytes.get_unchecked_mut(start + i) = *buf.get_unchecked(i);
*self.buf.bytes.assume_init_mut().get_unchecked_mut(start + i) = *buf.get_unchecked(i);
}
}
self.index = Index::from(start + len);
Expand All @@ -70,7 +71,7 @@ impl Default for Hasher {
#[allow(deprecated)]
fn default() -> Self {
Hasher {
buf: unsafe { mem::uninitialized() },
buf: Buffer { bytes: MaybeUninit::uninit() },
index: Index::_0,
processed: 0,
state: State(0),
Expand All @@ -84,20 +85,26 @@ impl crate::Hasher for Hasher {
let mut state = match self.index {
Index::_3 => {
let mut block = 0;
block ^= u32::from(self.buf.bytes[2]) << 16;
block ^= u32::from(self.buf.bytes[1]) << 8;
block ^= u32::from(self.buf.bytes[0]);
unsafe {
block ^= u32::from(self.buf.bytes.assume_init_ref()[2]) << 16;
block ^= u32::from(self.buf.bytes.assume_init_ref()[1]) << 8;
block ^= u32::from(self.buf.bytes.assume_init_ref()[0]);
}
self.state.0 ^ pre_mix(block)
}
Index::_2 => {
let mut block = 0;
block ^= u32::from(self.buf.bytes[1]) << 8;
block ^= u32::from(self.buf.bytes[0]);
unsafe {
block ^= u32::from(self.buf.bytes.assume_init_ref()[1]) << 8;
block ^= u32::from(self.buf.bytes.assume_init_ref()[0]);
}
self.state.0 ^ pre_mix(block)
}
Index::_1 => {
let mut block = 0;
block ^= u32::from(self.buf.bytes[0]);
unsafe {
block ^= u32::from(self.buf.bytes.assume_init_ref()[0]);
}
self.state.0 ^ pre_mix(block)
}
Index::_0 => self.state.0,
Expand Down Expand Up @@ -139,7 +146,7 @@ impl core::hash::Hasher for Hasher {
// self.buf.bytes[index..].copy_from_slice(head);
for i in 0..4 - index {
unsafe {
*self.buf.bytes.get_unchecked_mut(index + i) = *head.get_unchecked(i);
*self.buf.bytes.assume_init_mut().get_unchecked_mut(index + i) = *head.get_unchecked(i);
}
}

Expand Down Expand Up @@ -184,8 +191,8 @@ const C2: u32 = 0x1b873593;
const R1: u32 = 15;

impl State {
fn process_block(&mut self, block: &[u8; 4]) {
self.0 ^= pre_mix(LE::read_u32(block));
fn process_block(&mut self, block: &MaybeUninit<[u8; 4]>) {
self.0 ^= pre_mix(LE::read_u32(unsafe { block.assume_init_ref() }));
self.0 = self.0.rotate_left(13);
self.0 = 5u32.wrapping_mul(self.0).wrapping_add(0xe6546b64);
}
Expand Down