fix(bloomfilter): change Salt to a type alias

Author: wenkokke

bloomfilter/src/Data/BloomFilter/Blocked.hs

@@ -16,7 +16,7 @@
 module Data.BloomFilter.Blocked (
     -- * Types
     Hash,
-    Salt (Salt),
+    Salt,
     Hashable,
 
     -- * Immutable Bloom filters

bloomfilter/src/Data/BloomFilter/Blocked/Internal.hs

@@ -20,7 +20,7 @@ module Data.BloomFilter.Blocked.Internal (
 
     -- * Hash-based operations
     Hashes,
-    Salt (Salt),
+    Salt,
     Hasher (hashes),
     insertHashes,
     prefetchInsert,
@@ -54,7 +54,6 @@ import           Data.BloomFilter.Blocked.BitArray (BitArray, BitIx (..),
 import qualified Data.BloomFilter.Blocked.BitArray as BitArray
 import           Data.BloomFilter.Classic.Calc
 import           Data.BloomFilter.Hash
-import           Data.Word (Word64)
 
 -- | The version of the format used by 'serialise' and 'deserialise'. The
 -- format number will change when there is an incompatible change in the
@@ -326,10 +325,6 @@ newtype Hashes a = Hashes Hash
   deriving newtype Prim
 type role Hashes nominal
 
--- | The salt value to be used for hashes.
-newtype Salt = Salt Word64
-  deriving stock (Eq, Show)
-
 type Hasher :: (Type -> Type) -> Constraint
 class Hasher b where
   hashes :: (Hashable a) => b a -> a -> Hashes a
@@ -346,7 +341,7 @@ instance Hasher Bloom where
 
 {-# INLINE hashesWithSalt #-}
 hashesWithSalt :: (Hashable a) => Salt -> a -> Hashes a
-hashesWithSalt = \ (Salt !salt) !x -> Hashes (hashSalt64 salt x)
+hashesWithSalt = \ !salt !x -> Hashes (hashSalt64 salt x)
 
 {-# INLINE blockIxAndBitGen #-}
 -- | The scheme for turning 'Hashes' into block and bit indexes is as follows:

bloomfilter/src/Data/BloomFilter/Classic.hs

@@ -22,7 +22,7 @@ module Data.BloomFilter.Classic (
 
     -- * Types
     Hash,
-    Salt (Salt),
+    Salt,
     Hashable,
 
     -- * Immutable Bloom filters

bloomfilter/src/Data/BloomFilter/Classic/Calc.hs

@@ -1,6 +1,7 @@
 -- | Various formulas for working with bloomfilters.
 module Data.BloomFilter.Classic.Calc (
     NumEntries,
+    Salt,
     BloomSize (..),
     FPR,
     sizeForFPR,
@@ -13,12 +14,16 @@ module Data.BloomFilter.Classic.Calc (
     policyForBits,
 ) where
 
+import           Data.Word (Word64)
 import           Numeric
 
 type FPR          = Double
 type BitsPerEntry = Double
 type NumEntries   = Int
 
+-- | The salt value to be used for hashes.
+type Salt = Word64
+
 -- | A policy on intended bloom filter size -- independent of the number of
 -- elements.
 --

bloomfilter/src/Data/BloomFilter/Classic/Internal.hs

@@ -20,7 +20,7 @@ module Data.BloomFilter.Classic.Internal (
 
     -- * Hash-based operations
     Hashes,
-    Salt (Salt),
+    Salt,
     Hasher (hashes),
     insertHashes,
     elemHashes,
@@ -324,10 +324,6 @@ word64ToWordShim# x# = x#
 data Hashes a = Hashes !Hash !Hash
 type role Hashes nominal
 
--- | The salt value to be used for hashes.
-newtype Salt = Salt Word64
-  deriving stock (Eq, Show)
-
 instance Prim (Hashes a) where
     sizeOfType# _ = 16#
     alignmentOfType# _ = 8#
@@ -457,5 +453,5 @@ instance Hasher Bloom where
 --
 -- It's simply hashes the value twice using seed 0 and 1.
 hashesWithSalt :: Hashable a => Salt -> a -> Hashes a
-hashesWithSalt (Salt salt) v = Hashes (hashSalt64 salt v) (hashSalt64 (salt + 1) v)
+hashesWithSalt salt v = Hashes (hashSalt64 salt v) (hashSalt64 (salt + 1) v)
 {-# INLINE hashesWithSalt #-}