From 64c3f6afb183eb0eef9472a2b645a19a7b73eda2 Mon Sep 17 00:00:00 2001 From: Daniel Csillag Date: Fri, 14 Apr 2023 11:14:01 -0300 Subject: [PATCH] Change SipHash2-4 -> SipHash1-3 --- src/cache.rs | 4 ++-- src/constraint.rs | 4 ++-- src/prehashed.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cache.rs b/src/cache.rs index 8b17529..05e8116 100644 --- a/src/cache.rs +++ b/src/cache.rs @@ -2,7 +2,7 @@ use std::any::{Any, TypeId}; use std::cell::RefCell; use std::collections::HashMap; -use siphasher::sip128::{Hasher128, SipHasher}; +use siphasher::sip128::{Hasher128, SipHasher13}; use crate::constraint::Join; use crate::input::Input; @@ -23,7 +23,7 @@ where CACHE.with(|cache| { // Compute the hash of the input's key part. let key = { - let mut state = SipHasher::new(); + let mut state = SipHasher13::new(); input.key(&mut state); let hash = state.finish128().as_u128(); (id, hash) diff --git a/src/constraint.rs b/src/constraint.rs index 2c48843..e2421a8 100644 --- a/src/constraint.rs +++ b/src/constraint.rs @@ -1,7 +1,7 @@ use std::cell::RefCell; use std::hash::Hash; -use siphasher::sip128::{Hasher128, SipHasher}; +use siphasher::sip128::{Hasher128, SipHasher13}; use crate::track::Trackable; @@ -121,7 +121,7 @@ where /// Produce a 128-bit hash of a value. #[inline] pub fn hash(value: &T) -> u128 { - let mut state = SipHasher::new(); + let mut state = SipHasher13::new(); value.hash(&mut state); state.finish128().as_u128() } diff --git a/src/prehashed.rs b/src/prehashed.rs index 1177a9d..4cfd03c 100644 --- a/src/prehashed.rs +++ b/src/prehashed.rs @@ -4,7 +4,7 @@ use std::fmt::{self, Debug, Formatter}; use std::hash::{Hash, Hasher}; use std::ops::Deref; -use siphasher::sip128::{Hasher128, SipHasher}; +use siphasher::sip128::{Hasher128, SipHasher13}; /// A wrapper type with precomputed hash. /// @@ -62,7 +62,7 @@ impl Prehashed { fn hash(item: &T) -> u128 { // Also hash the TypeId because the type might be converted // through an unsized coercion. - let mut state = SipHasher::new(); + let mut state = SipHasher13::new(); item.type_id().hash(&mut state); item.hash(&mut state); state.finish128().as_u128()