Resolve commercialhaskell#953. Use deepseq own generic derivation

phadej · phadej · commit b3533c103a54 · 2015-09-08T20:03:28.000+03:00
diff --git a/src/Data/Binary/VersionTagged.hs b/src/Data/Binary/VersionTagged.hs
@@ -14,10 +14,9 @@ module Data.Binary.VersionTagged
     , HasSemanticVersion
     , decodeFileOrFailDeep
     , NFData (..)
-    , genericRnf
     ) where
 
-import Control.DeepSeq.Generics (NFData (..), genericRnf)
+import Control.DeepSeq (NFData (..))
 import Control.Exception (Exception)
 import Control.Monad.Catch (MonadThrow (..))
 import Control.Monad.IO.Class (MonadIO, liftIO)
diff --git a/src/Stack/Build/Cache.hs b/src/Stack/Build/Cache.hs
@@ -99,8 +99,7 @@ data BuildCache = BuildCache
 instance Binary BuildCache
 instance HasStructuralInfo BuildCache
 instance HasSemanticVersion BuildCache
-instance NFData BuildCache where
-    rnf = genericRnf
+instance NFData BuildCache
 
 -- | Try to read the dirtiness cache for the given package directory.
 tryGetBuildCache :: (MonadIO m, MonadReader env m, HasConfig env, MonadThrow m, MonadLogger m, HasEnvConfig env)
diff --git a/src/Stack/PackageDump.hs b/src/Stack/PackageDump.hs
@@ -74,8 +74,7 @@ data InstalledCacheEntry = InstalledCacheEntry
     deriving (Eq, Generic)
 instance Binary InstalledCacheEntry
 instance HasStructuralInfo InstalledCacheEntry
-instance NFData InstalledCacheEntry where
-    rnf = genericRnf
+instance NFData InstalledCacheEntry
 
 -- | Call ghc-pkg dump with appropriate flags and stream to the given @Sink@, for a single database
 ghcPkgDump
diff --git a/src/Stack/PackageIndex.hs b/src/Stack/PackageIndex.hs
@@ -90,9 +90,8 @@ data PackageCache = PackageCache
     }
     deriving (Generic)
 
-instance Binary.Binary PackageCache
-instance NFData PackageCache where
-    rnf = genericRnf
+instance Binary PackageCache
+instance NFData PackageCache
 instance HasStructuralInfo PackageCache
 
 newtype PackageCacheMap = PackageCacheMap (Map PackageIdentifier PackageCache)
@@ -366,8 +365,7 @@ data PackageDownload = PackageDownload
     deriving (Show, Generic)
 instance Binary.Binary PackageDownload
 instance HasStructuralInfo PackageDownload
-instance NFData PackageDownload where
-    rnf = genericRnf
+instance NFData PackageDownload
 instance FromJSON PackageDownload where
     parseJSON = withObject "Package" $ \o -> do
         hashes <- o .: "package-hashes"
diff --git a/src/Stack/Types/Build.hs b/src/Stack/Types/Build.hs
@@ -519,9 +519,7 @@ instance Binary ConfigCache where
         4 <- getWord8
         8 <- getWord8
         fmap to gget
-instance NFData ConfigCache where
-    rnf = genericRnf
-
+instance NFData ConfigCache
 instance HasStructuralInfo ConfigCache
 instance HasSemanticVersion ConfigCache
 
@@ -716,8 +714,7 @@ data ConfigureOpts = ConfigureOpts
     deriving (Show, Eq, Generic)
 instance Binary ConfigureOpts
 instance HasStructuralInfo ConfigureOpts
-instance NFData ConfigureOpts where
-    rnf = genericRnf
+instance NFData ConfigureOpts
 
 -- | Information on a compiled package: the library conf file (if relevant),
 -- and all of the executable paths.
@@ -732,5 +729,4 @@ data PrecompiledCache = PrecompiledCache
 instance Binary PrecompiledCache
 instance HasSemanticVersion PrecompiledCache
 instance HasStructuralInfo PrecompiledCache
-instance NFData PrecompiledCache where
-    rnf = genericRnf
+instance NFData PrecompiledCache
diff --git a/src/Stack/Types/BuildPlan.hs b/src/Stack/Types/BuildPlan.hs
@@ -375,8 +375,7 @@ data MiniBuildPlan = MiniBuildPlan
     }
     deriving (Generic, Show, Eq)
 instance Binary MiniBuildPlan
-instance NFData MiniBuildPlan where
-    rnf = genericRnf
+instance NFData MiniBuildPlan
 instance HasStructuralInfo MiniBuildPlan
 instance HasSemanticVersion MiniBuildPlan
 
@@ -398,8 +397,7 @@ data MiniPackageInfo = MiniPackageInfo
     deriving (Generic, Show, Eq)
 instance Binary MiniPackageInfo
 instance HasStructuralInfo MiniPackageInfo
-instance NFData MiniPackageInfo where
-    rnf = genericRnf
+instance NFData MiniPackageInfo
 
 
 isWindows :: OS -> Bool
diff --git a/src/Stack/Types/Compiler.hs b/src/Stack/Types/Compiler.hs
@@ -5,7 +5,6 @@
 module Stack.Types.Compiler where
 
 import           Control.DeepSeq
-import           Control.DeepSeq.Generics (genericRnf)
 import           Data.Aeson
 import           Data.Binary.VersionTagged (Binary, HasStructuralInfo)
 import           Data.Monoid ((<>))
@@ -35,8 +34,7 @@ data CompilerVersion
     deriving (Generic, Show, Eq, Ord)
 instance Binary CompilerVersion
 instance HasStructuralInfo CompilerVersion
-instance NFData CompilerVersion where
-    rnf = genericRnf
+instance NFData CompilerVersion
 instance ToJSON CompilerVersion where
     toJSON = toJSON . compilerVersionName
 instance FromJSON CompilerVersion where
diff --git a/src/Stack/Types/GhcPkgId.hs b/src/Stack/Types/GhcPkgId.hs
@@ -52,8 +52,7 @@ instance Binary GhcPkgId where
         4 <- getWord8
         7 <- getWord8
         fmap GhcPkgId get
-instance NFData GhcPkgId where
-    rnf = genericRnf
+instance NFData GhcPkgId
 instance HasStructuralInfo GhcPkgId
 
 instance Show GhcPkgId where
diff --git a/src/Stack/Types/Package.hs b/src/Stack/Types/Package.hs
@@ -229,8 +229,7 @@ data FileCacheInfo = FileCacheInfo
     deriving (Generic, Show)
 instance Binary FileCacheInfo
 instance HasStructuralInfo FileCacheInfo
-instance NFData FileCacheInfo where
-    rnf = genericRnf
+instance NFData FileCacheInfo
 
 -- | Used for storage and comparison.
 newtype ModTime = ModTime (Integer,Rational)
diff --git a/stack.cabal b/stack.cabal
@@ -120,7 +120,6 @@ library
                    , containers >= 0.5.5.1
                    , cryptohash >= 0.11.6
                    , cryptohash-conduit
-                   , deepseq-generics
                    , directory >= 1.2.1.0
                    , enclosed-exceptions
                    , exceptions >= 0.8.0.2
