Reduce amount of CPP by removing redundant HAVE_DEEPSEQ conditional

Author: hvr

Data/Text.hs

@@ -204,9 +204,7 @@ import Prelude (Char, Bool(..), Int, Maybe(..), String,
                 Read(..),
                 (&&), (||), (+), (-), (.), ($), ($!), (>>),
                 not, return, otherwise, quot)
-#if defined(HAVE_DEEPSEQ)
 import Control.DeepSeq (NFData(rnf))
-#endif
 #if defined(ASSERTS)
 import Control.Exception (assert)
 #endif
@@ -381,9 +379,7 @@ instance Exts.IsList Text where
     toList         = unpack
 #endif
 
-#if defined(HAVE_DEEPSEQ)
 instance NFData Text where rnf !_ = ()
-#endif
 
 -- | @since 1.2.1.0
 instance Binary Text where

Data/Text/Lazy.hs

@@ -205,9 +205,7 @@ import Prelude (Char, Bool(..), Maybe(..), String,
                 (&&), (||), (+), (-), (.), ($), (++),
                 error, flip, fmap, fromIntegral, not, otherwise, quot)
 import qualified Prelude as P
-#if defined(HAVE_DEEPSEQ)
 import Control.DeepSeq (NFData(..))
-#endif
 import Data.Int (Int64)
 import qualified Data.List as L
 import Data.Char (isSpace)
@@ -375,11 +373,9 @@ instance Exts.IsList Text where
     toList         = unpack
 #endif
 
-#if defined(HAVE_DEEPSEQ)
 instance NFData Text where
     rnf Empty        = ()
     rnf (Chunk _ ts) = rnf ts
-#endif
 
 -- | @since 1.2.1.0
 instance Binary Text where

benchmarks/text-benchmarks.cabal

@@ -28,7 +28,7 @@ executable text-benchmarks
   ghc-options:    -Wall -O2 -rtsopts
   if flag(llvm)
     ghc-options:  -fllvm
-  cpp-options:    -DHAVE_DEEPSEQ -DINTEGER_GMP
+  cpp-options:    -DINTEGER_GMP
   build-depends:  array,
                   base == 4.*,
                   binary,

tests/.ghci

@@ -1 +1 @@
-:set -DHAVE_DEEPSEQ -isrc -i../..
+:set -isrc -i../..

tests/text-tests.cabal

@@ -47,7 +47,6 @@ executable text-tests
   cpp-options:
     -DTEST_SUITE
     -DASSERTS
-    -DHAVE_DEEPSEQ
 
   build-depends:
     HUnit >= 1.2,
@@ -139,7 +138,6 @@ library
 
   cpp-options:
     -DTEST_SUITE
-    -DHAVE_DEEPSEQ
     -DASSERTS
     -DINTEGER_GMP
 

text.cabal

@@ -155,7 +155,6 @@ library
   else
     build-depends: bytestring         >= 0.10.4 && < 0.11
 
-  cpp-options: -DHAVE_DEEPSEQ
   ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2
   if flag(developer)
     ghc-prof-options: -auto-all
@@ -178,7 +177,7 @@ test-suite tests
     -Wall -threaded -rtsopts
 
   cpp-options:
-    -DASSERTS -DHAVE_DEEPSEQ -DTEST_SUITE
+    -DASSERTS -DTEST_SUITE
 
   -- modules specific to test-suite
   hs-source-dirs: tests