bloomfilter: enable the same warnings as other packages

Author: dcoutts

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

@@ -45,7 +45,7 @@ import           GHC.ST (ST (ST))
 -- so that multiple accesses within a single block will use only one cache line.
 --
 newtype BitArray = BitArray (PrimArray Word64)
-  deriving (Eq, Show)
+  deriving stock (Eq, Show)
 
 -- | The number of 512-bit blocks for the given number of bits. This rounds
 -- up to the nearest multiple of 512.

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

@@ -153,17 +153,17 @@ data Bloom a = Bloom {
     , numHashes :: {-# UNPACK #-} !Int
     , bitArray  :: {-# UNPACK #-} !BitArray
     }
-  deriving Eq
+  deriving stock Eq
 type role Bloom nominal
 
 bloomInvariant :: Bloom a -> Bool
 bloomInvariant Bloom { numBlocks, bitArray = BitArray.BitArray pa } =
-    fromIntegral numBlocks * 8 == sizeofPrimArray pa
+    numBlocks * 8 == sizeofPrimArray pa
 
 instance Show (Bloom a) where
     show mb = "Bloom { " ++ show numBits ++ " bits } "
       where
-        numBits = blocksToBits (fromIntegral (numBlocks mb))
+        numBits = blocksToBits (numBlocks mb)
 
 instance NFData (Bloom a) where
     rnf !_ = ()

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

@@ -31,7 +31,7 @@ import           GHC.ST (ST (ST))
 --
 -- This vector's offset and length are multiples of 64
 newtype BitArray = BitArray (PrimArray Word64)
-  deriving (Eq, Show)
+  deriving stock (Eq, Show)
 
 {-# INLINE unsafeIndex #-}
 unsafeIndex :: BitArray -> Int -> Bool

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

@@ -43,7 +43,7 @@ data BloomPolicy = BloomPolicy {
        policyBits   :: !Double,
        policyHashes :: !Int
      }
-  deriving Show
+  deriving stock Show
 
 policyForFPR :: FPR -> BloomPolicy
 policyForFPR fpr | fpr <= 0 || fpr >= 1 =
@@ -96,7 +96,7 @@ data BloomSize = BloomSize {
                    -- | The number of hash functions to use.
                    sizeHashes :: !Int
                  }
-  deriving Show
+  deriving stock Show
 
 sizeForFPR :: FPR -> NumEntries -> BloomSize
 sizeForFPR = sizeForPolicy . policyForFPR

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

@@ -142,7 +142,7 @@ data Bloom a = Bloom {
     , numHashes :: {-# UNPACK #-} !Int
     , bitArray  :: {-# UNPACK #-} !BitArray
     }
-  deriving Eq
+  deriving stock Eq
 type role Bloom nominal
 
 bloomInvariant :: Bloom a -> Bool
@@ -276,7 +276,6 @@ word64ToWordShim# x# = x#
 --
 -- See 'evalHashes'.
 data Hashes a = Hashes !Hash !Hash
-  deriving Show
 type role Hashes nominal
 
 instance Prim (Hashes a) where

lsm-tree.cabal

@@ -406,7 +406,7 @@ test-suite xxhash-tests
 
 -- this fork doesn't work on 32bit systems
 library bloomfilter
-  import:          language
+  import:          language, warnings
   visibility:      private
   hs-source-dirs:  bloomfilter/src
   build-depends:
@@ -430,7 +430,7 @@ library bloomfilter
     Data.BloomFilter.Classic.Calc
     Data.BloomFilter.Classic.Internal
 
-  ghc-options:     -O2 -Wall
+  ghc-options:     -O2
 
 test-suite bloomfilter-tests
   import:         language, warnings