Merge pull request #11967 from haskell/require-deepseq-1.4

Remove compatibility layer for deepseq<1.4

Author: mergify[bot]

Cabal-syntax/Cabal-syntax.cabal

@@ -33,7 +33,7 @@ library
     , binary     >= 0.8.1    && < 0.9
     , bytestring >= 0.10.4.0 && < 0.13
     , containers >= 0.5.2    && < 0.9
-    , deepseq    >= 1.3.0.1  && < 1.7
+    , deepseq    >= 1.4      && < 1.7
     , directory  >= 1.2      && < 1.4
     , filepath   >= 1.3.0.1  && < 1.6
     , mtl        >= 2.1      && < 2.4

Cabal-syntax/src/Distribution/CabalSpecVersion.hs

@@ -42,7 +42,7 @@ data CabalSpecVersion
 
 instance Binary CabalSpecVersion
 instance Structured CabalSpecVersion
-instance NFData CabalSpecVersion where rnf = genericRnf
+instance NFData CabalSpecVersion
 
 -- | Show cabal spec version, but not the way in the .cabal files
 --

Cabal-syntax/src/Distribution/Compat/Prelude.hs

@@ -1,7 +1,6 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE Trustworthy #-}
-{-# LANGUAGE TypeOperators #-}
 
 -- | This module does two things:
 --
@@ -25,7 +24,6 @@ module Distribution.Compat.Prelude
   , Data
   , Generic
   , NFData (..)
-  , genericRnf
   , Binary (..)
   , Structured
   , Alternative (..)
@@ -235,7 +233,7 @@ import Data.Void (Void, absurd, vacuous)
 import Data.Word (Word, Word16, Word32, Word64, Word8)
 import Distribution.Compat.Binary (Binary (..))
 import Distribution.Compat.Semigroup (gmappend, gmempty)
-import GHC.Generics (Generic (..), K1 (unK1), M1 (unM1), U1 (U1), V1, (:*:) ((:*:)), (:+:) (L1, R1))
+import GHC.Generics (Generic)
 import System.Exit (ExitCode (..), exitFailure, exitSuccess, exitWith)
 import Text.Read (readMaybe)
 
@@ -251,47 +249,6 @@ import qualified Debug.Trace
 (<<>>) :: Disp.Doc -> Disp.Doc -> Disp.Doc
 (<<>>) = (Disp.<>)
 
--- | "GHC.Generics"-based 'rnf' implementation
---
--- This is needed in order to support @deepseq < 1.4@ which didn't
--- have a 'Generic'-based default 'rnf' implementation yet.
---
--- In order to define instances, use e.g.
---
--- > instance NFData MyType where rnf = genericRnf
---
--- The implementation has been taken from @deepseq-1.4.2@'s default
--- 'rnf' implementation.
-genericRnf :: (Generic a, GNFData (Rep a)) => a -> ()
-genericRnf = grnf . from
-
--- | Hidden internal type-class
-class GNFData f where
-  grnf :: f a -> ()
-
-instance GNFData V1 where
-  grnf = error "Control.DeepSeq.rnf: uninhabited type"
-
-instance GNFData U1 where
-  grnf U1 = ()
-
-instance NFData a => GNFData (K1 i a) where
-  grnf = rnf . unK1
-  {-# INLINEABLE grnf #-}
-
-instance GNFData a => GNFData (M1 i c a) where
-  grnf = grnf . unM1
-  {-# INLINEABLE grnf #-}
-
-instance (GNFData a, GNFData b) => GNFData (a :*: b) where
-  grnf (x :*: y) = grnf x `seq` grnf y
-  {-# INLINEABLE grnf #-}
-
-instance (GNFData a, GNFData b) => GNFData (a :+: b) where
-  grnf (L1 x) = grnf x
-  grnf (R1 x) = grnf x
-  {-# INLINEABLE grnf #-}
-
 -- TODO: if we want foldr1/foldl1 to work on more than NonEmpty, we
 -- can define a local typeclass 'Foldable1', e.g.
 --

Cabal-syntax/src/Distribution/Compiler.hs

@@ -83,7 +83,7 @@ data CompilerFlavor
 
 instance Binary CompilerFlavor
 instance Structured CompilerFlavor
-instance NFData CompilerFlavor where rnf = genericRnf
+instance NFData CompilerFlavor
 
 knownCompilerFlavors :: [CompilerFlavor]
 knownCompilerFlavors =
@@ -177,7 +177,7 @@ data CompilerId = CompilerId CompilerFlavor Version
 
 instance Binary CompilerId
 instance Structured CompilerId
-instance NFData CompilerId where rnf = genericRnf
+instance NFData CompilerId
 
 instance Pretty CompilerId where
   pretty (CompilerId f v)

Cabal-syntax/src/Distribution/License.hs

@@ -115,7 +115,7 @@ data License
 
 instance Binary License
 instance Structured License
-instance NFData License where rnf = genericRnf
+instance NFData License
 
 -- | The list of all currently recognised licenses.
 knownLicenses :: [License]

Cabal-syntax/src/Distribution/Parsec/Error.hs

@@ -23,7 +23,7 @@ data PErrorWithSource src = PErrorWithSource {perrorSource :: !(PSource src), pe
   deriving (Show, Generic, Functor)
 
 instance Binary PError
-instance NFData PError where rnf = genericRnf
+instance NFData PError
 
 showPError :: FilePath -> PError -> String
 showPError fpath (PError pos msg) =

Cabal-syntax/src/Distribution/Parsec/Position.hs

@@ -21,7 +21,7 @@ data Position
   deriving (Eq, Ord, Show, Generic)
 
 instance Binary Position
-instance NFData Position where rnf = genericRnf
+instance NFData Position
 
 -- | Shift position by n columns to the right.
 incPos :: Int -> Position -> Position

Cabal-syntax/src/Distribution/Parsec/Source.hs

@@ -42,4 +42,4 @@ instance Eq src => Eq (PSource src) where
   _ == _ = False
 
 instance Binary src => Binary (PSource src)
-instance NFData src => NFData (PSource src) where rnf = genericRnf
+instance NFData src => NFData (PSource src)

Cabal-syntax/src/Distribution/Parsec/Warning.hs

@@ -70,7 +70,7 @@ data PWarnType
   deriving (Eq, Ord, Show, Enum, Bounded, Generic)
 
 instance Binary PWarnType
-instance NFData PWarnType where rnf = genericRnf
+instance NFData PWarnType
 
 -- | Parser warning.
 data PWarning = PWarning {pwarningType :: !PWarnType, pwarningPosition :: !Position, pwarningMessage :: !String}
@@ -80,7 +80,7 @@ data PWarningWithSource src = PWarningWithSource {pwarningSource :: !(PSource sr
   deriving (Eq, Ord, Show, Generic, Functor)
 
 instance Binary PWarning
-instance NFData PWarning where rnf = genericRnf
+instance NFData PWarning
 
 showPWarning :: FilePath -> PWarning -> String
 showPWarning fpath (PWarning _ pos msg) =

Cabal-syntax/src/Distribution/System.hs

@@ -111,7 +111,7 @@ data OS
 
 instance Binary OS
 instance Structured OS
-instance NFData OS where rnf = genericRnf
+instance NFData OS
 
 knownOSs :: [OS]
 knownOSs =
@@ -214,7 +214,7 @@ data Arch
 
 instance Binary Arch
 instance Structured Arch
-instance NFData Arch where rnf = genericRnf
+instance NFData Arch
 
 knownArches :: [Arch]
 knownArches =
@@ -285,7 +285,7 @@ data Platform = Platform Arch OS
 
 instance Binary Platform
 instance Structured Platform
-instance NFData Platform where rnf = genericRnf
+instance NFData Platform
 
 instance Pretty Platform where
   pretty (Platform arch os) = pretty arch <<>> Disp.char '-' <<>> pretty os