1
Fork 0

Remove unused field from StableHasher.

This commit is contained in:
Michael Woerister 2019-05-17 15:27:08 +02:00
parent 68fd80fa1e
commit eed1e1ecd2

View file

@ -15,7 +15,6 @@ use crate::bit_set;
/// extended to 64 bits if needed. /// extended to 64 bits if needed.
pub struct StableHasher<W> { pub struct StableHasher<W> {
state: SipHasher128, state: SipHasher128,
bytes_hashed: u64,
width: PhantomData<W>, width: PhantomData<W>,
} }
@ -33,7 +32,6 @@ impl<W: StableHasherResult> StableHasher<W> {
pub fn new() -> Self { pub fn new() -> Self {
StableHasher { StableHasher {
state: SipHasher128::new_with_keys(0, 0), state: SipHasher128::new_with_keys(0, 0),
bytes_hashed: 0,
width: PhantomData, width: PhantomData,
} }
} }
@ -61,11 +59,6 @@ impl<W> StableHasher<W> {
pub fn finalize(self) -> (u64, u64) { pub fn finalize(self) -> (u64, u64) {
self.state.finish128() self.state.finish128()
} }
#[inline]
pub fn bytes_hashed(&self) -> u64 {
self.bytes_hashed
}
} }
impl<W> Hasher for StableHasher<W> { impl<W> Hasher for StableHasher<W> {
@ -76,37 +69,31 @@ impl<W> Hasher for StableHasher<W> {
#[inline] #[inline]
fn write(&mut self, bytes: &[u8]) { fn write(&mut self, bytes: &[u8]) {
self.state.write(bytes); self.state.write(bytes);
self.bytes_hashed += bytes.len() as u64;
} }
#[inline] #[inline]
fn write_u8(&mut self, i: u8) { fn write_u8(&mut self, i: u8) {
self.state.write_u8(i); self.state.write_u8(i);
self.bytes_hashed += 1;
} }
#[inline] #[inline]
fn write_u16(&mut self, i: u16) { fn write_u16(&mut self, i: u16) {
self.state.write_u16(i.to_le()); self.state.write_u16(i.to_le());
self.bytes_hashed += 2;
} }
#[inline] #[inline]
fn write_u32(&mut self, i: u32) { fn write_u32(&mut self, i: u32) {
self.state.write_u32(i.to_le()); self.state.write_u32(i.to_le());
self.bytes_hashed += 4;
} }
#[inline] #[inline]
fn write_u64(&mut self, i: u64) { fn write_u64(&mut self, i: u64) {
self.state.write_u64(i.to_le()); self.state.write_u64(i.to_le());
self.bytes_hashed += 8;
} }
#[inline] #[inline]
fn write_u128(&mut self, i: u128) { fn write_u128(&mut self, i: u128) {
self.state.write_u128(i.to_le()); self.state.write_u128(i.to_le());
self.bytes_hashed += 16;
} }
#[inline] #[inline]
@ -115,37 +102,31 @@ impl<W> Hasher for StableHasher<W> {
// platforms. This is important for symbol hashes when cross compiling, // platforms. This is important for symbol hashes when cross compiling,
// for example. // for example.
self.state.write_u64((i as u64).to_le()); self.state.write_u64((i as u64).to_le());
self.bytes_hashed += 8;
} }
#[inline] #[inline]
fn write_i8(&mut self, i: i8) { fn write_i8(&mut self, i: i8) {
self.state.write_i8(i); self.state.write_i8(i);
self.bytes_hashed += 1;
} }
#[inline] #[inline]
fn write_i16(&mut self, i: i16) { fn write_i16(&mut self, i: i16) {
self.state.write_i16(i.to_le()); self.state.write_i16(i.to_le());
self.bytes_hashed += 2;
} }
#[inline] #[inline]
fn write_i32(&mut self, i: i32) { fn write_i32(&mut self, i: i32) {
self.state.write_i32(i.to_le()); self.state.write_i32(i.to_le());
self.bytes_hashed += 4;
} }
#[inline] #[inline]
fn write_i64(&mut self, i: i64) { fn write_i64(&mut self, i: i64) {
self.state.write_i64(i.to_le()); self.state.write_i64(i.to_le());
self.bytes_hashed += 8;
} }
#[inline] #[inline]
fn write_i128(&mut self, i: i128) { fn write_i128(&mut self, i: i128) {
self.state.write_i128(i.to_le()); self.state.write_i128(i.to_le());
self.bytes_hashed += 16;
} }
#[inline] #[inline]
@ -154,7 +135,6 @@ impl<W> Hasher for StableHasher<W> {
// platforms. This is important for symbol hashes when cross compiling, // platforms. This is important for symbol hashes when cross compiling,
// for example. // for example.
self.state.write_i64((i as i64).to_le()); self.state.write_i64((i as i64).to_le());
self.bytes_hashed += 8;
} }
} }