Fix -Wderiving-typeable

Bodigrim · Bodigrim · commit d84fcbb867e0 · 2025-07-29T23:52:25.000+01:00
diff --git a/zlib/Codec/Compression/Zlib/Internal.hs b/zlib/Codec/Compression/Zlib/Internal.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP, RankNTypes, DeriveDataTypeable, BangPatterns #-}
+{-# LANGUAGE CPP, RankNTypes, BangPatterns #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE Trustworthy #-}
 -----------------------------------------------------------------------------
@@ -80,7 +80,6 @@ import Control.Exception (Exception, throw, assert)
 import Control.Monad.ST.Lazy hiding (stToIO)
 import Control.Monad.ST.Strict (stToIO)
 import qualified Control.Monad.ST.Unsafe as Unsafe (unsafeIOToST)
-import Data.Typeable (Typeable)
 import GHC.Generics (Generic)
 import Data.Bits (toIntegralSized)
 import qualified Data.ByteString.Lazy as L
@@ -118,7 +117,6 @@ data CompressParams = CompressParams {
   ( Eq       -- ^ @since 0.7.0.0
   , Ord      -- ^ @since 0.7.0.0
   , Show
-  , Typeable -- ^ @since 0.7.0.0
   , Generic  -- ^ @since 0.7.0.0
   )
 
@@ -150,7 +148,6 @@ data DecompressParams = DecompressParams {
   ( Eq       -- ^ @since 0.7.0.0
   , Ord      -- ^ @since 0.7.0.0
   , Show
-  , Typeable -- ^ @since 0.7.0.0
   , Generic  -- ^ @since 0.7.0.0
   )
 
@@ -250,7 +247,6 @@ data DecompressError =
   deriving
   ( Eq
   , Ord     -- ^ @since 0.7.0.0
-  , Typeable
   , Generic -- ^ @since 0.7.0.0
            )
 
diff --git a/zlib/Codec/Compression/Zlib/Stream.hsc b/zlib/Codec/Compression/Zlib/Stream.hsc
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP, ForeignFunctionInterface, DeriveDataTypeable #-}
+{-# LANGUAGE CPP, ForeignFunctionInterface #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE CApiFFI #-}
 -----------------------------------------------------------------------------
@@ -121,7 +121,6 @@ import Control.Exception (assert)
 import Data.Bits (toIntegralSized)
 import Data.Coerce (coerce)
 import Data.Maybe (fromMaybe)
-import Data.Typeable (Typeable)
 import GHC.Generics (Generic)
 #ifdef DEBUG
 import System.IO (hPutStrLn, stderr)
@@ -580,7 +579,7 @@ fromFlush Block     = #{const Z_BLOCK}
 -- variations.
 --
 data Format = GZip | Zlib | Raw | GZipOrZlib
-  deriving (Eq, Ord, Enum, Bounded, Show, Typeable
+  deriving (Eq, Ord, Enum, Bounded, Show
               , Generic
            )
 
@@ -622,7 +621,7 @@ formatSupportsDictionary _    = False
 -- | The compression method
 --
 data Method = Deflated
-  deriving (Eq, Ord, Enum, Bounded, Show, Typeable
+  deriving (Eq, Ord, Enum, Bounded, Show
               , Generic
            )
 
@@ -645,7 +644,6 @@ newtype CompressionLevel = CompressionLevel Int
   ( Eq
   , Ord -- ^ @since 0.7.0.0
   , Show
-  , Typeable
   , Generic
   )
 
@@ -705,7 +703,6 @@ newtype WindowBits = WindowBits Int
   ( Eq
   , Ord
   , Show
-  , Typeable
   , Generic
   )
 
@@ -764,7 +761,6 @@ newtype MemoryLevel = MemoryLevel Int
   ( Eq
   , Ord -- ^ @since 0.7.0.0
   , Show
-  , Typeable
   , Generic
   )
 
@@ -812,7 +808,7 @@ data CompressionStrategy =
   -- ^ @since 0.7.0.0
   | Fixed
   -- ^ @since 0.7.0.0
-  deriving (Eq, Ord, Enum, Bounded, Show, Typeable
+  deriving (Eq, Ord, Enum, Bounded, Show
               , Generic
            )
 
diff --git a/zlib/zlib.cabal b/zlib/zlib.cabal
@@ -80,8 +80,7 @@ library
 
   default-language: Haskell2010
 
-  other-extensions: CPP, ForeignFunctionInterface, RankNTypes, BangPatterns,
-                    DeriveDataTypeable
+  other-extensions: CPP, ForeignFunctionInterface, RankNTypes, BangPatterns
   other-extensions: DeriveGeneric
   other-extensions: CApiFFI
 
