Add a couple more instances

Author: dcoutts

Codec/Compression/Zlib/Internal.hs

@@ -106,7 +106,7 @@ data CompressParams = CompressParams {
   compressStrategy    :: !Stream.CompressionStrategy,
   compressBufferSize  :: !Int,
   compressDictionary  :: Maybe S.ByteString
-}
+} deriving Show
 
 -- | The full set of parameters for decompression. The defaults are
 -- 'defaultDecompressParams'.
@@ -132,7 +132,7 @@ data DecompressParams = DecompressParams {
   decompressBufferSize :: !Int,
   decompressDictionary :: Maybe S.ByteString,
   decompressAllMembers :: Bool
-}
+} deriving Show
 
 -- | The default set of parameters for compression. This is typically used with
 -- the @compressWith@ function with specific parameters overridden.

Codec/Compression/Zlib/Stream.hsc

@@ -714,10 +714,10 @@ fromCompressionLevel (CompressionLevel n)
 data WindowBits = WindowBits Int
                 | DefaultWindowBits -- This constructor must be last to make
                                     -- the Ord instance work. The Ord instance
-                                    -- is defined with and used by the tests.
+                                    -- is used by the tests.
                                     -- It makse sense because the default value
                                     -- is is also the max value at 15.
-  deriving (Eq, Show, Typeable
+  deriving (Eq, Ord, Show, Typeable
 #if __GLASGOW_HASKELL__ >= 702
               , Generic
 #endif

test/Test/Codec/Compression/Zlib/Internal.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE StandaloneDeriving #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 -- | Test code and properties for "Codec.Compression.Zlib.Internal"
@@ -12,8 +11,6 @@ import Test.QuickCheck
 import Control.Monad (ap)
 
 
-deriving instance Show CompressParams
-
 instance Arbitrary CompressParams where
   arbitrary = return CompressParams `ap` arbitrary `ap` arbitrary
                                     `ap` arbitrary `ap` arbitrary
@@ -27,8 +24,6 @@ arbitraryBufferSize = frequency $ [(10, return n) | n <- [1..1024]] ++
                                   [(1, return n) | n <- [131072..1048576]]
 
 
-deriving instance Show DecompressParams
-
 instance Arbitrary DecompressParams where
   arbitrary = return DecompressParams `ap` arbitrary
                                       `ap` arbitraryBufferSize

test/Test/Codec/Compression/Zlib/Stream.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE StandaloneDeriving #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 -- | Test code and properties for "Codec.Compression.Zlib.Stream"
@@ -24,7 +23,6 @@ instance Arbitrary CompressionLevel where
                       ++ map compressionLevel [1..9]
 
 
-deriving instance Ord WindowBits
 instance Arbitrary WindowBits where
   arbitrary = elements $ defaultWindowBits:map windowBits [8..15]