diff --git a/Data/Attoparsec/ByteString.hs b/Data/Attoparsec/ByteString.hs index 0de9bc0..c70892f 100644 --- a/Data/Attoparsec/ByteString.hs +++ b/Data/Attoparsec/ByteString.hs @@ -1,7 +1,5 @@ {-# LANGUAGE CPP #-} -#if __GLASGOW_HASKELL__ >= 702 {-# LANGUAGE Trustworthy #-} -#endif -- | -- Module : Data.Attoparsec.ByteString -- Copyright : Bryan O'Sullivan 2007-2015 diff --git a/Data/Attoparsec/ByteString/Char8.hs b/Data/Attoparsec/ByteString/Char8.hs index b4f6b57..8e6bd20 100644 --- a/Data/Attoparsec/ByteString/Char8.hs +++ b/Data/Attoparsec/ByteString/Char8.hs @@ -1,8 +1,6 @@ {-# LANGUAGE BangPatterns, CPP, FlexibleInstances, TypeFamilies, TypeSynonymInstances, GADTs #-} -#if __GLASGOW_HASKELL__ >= 702 {-# LANGUAGE Trustworthy #-} -- Imports internal modules -#endif {-# OPTIONS_GHC -fno-warn-orphans -fno-warn-warnings-deprecations #-} -- | diff --git a/Data/Attoparsec/ByteString/Lazy.hs b/Data/Attoparsec/ByteString/Lazy.hs index 73b7de4..3d3eeba 100644 --- a/Data/Attoparsec/ByteString/Lazy.hs +++ b/Data/Attoparsec/ByteString/Lazy.hs @@ -1,7 +1,5 @@ {-# LANGUAGE CPP #-} -#if __GLASGOW_HASKELL__ >= 702 {-# LANGUAGE Trustworthy #-} -- Imports internal modules -#endif -- | -- Module : Data.Attoparsec.ByteString.Lazy diff --git a/Data/Attoparsec/Combinator.hs b/Data/Attoparsec/Combinator.hs index 3ec004e..a352947 100644 --- a/Data/Attoparsec/Combinator.hs +++ b/Data/Attoparsec/Combinator.hs @@ -1,7 +1,5 @@ {-# LANGUAGE BangPatterns, CPP #-} -#if __GLASGOW_HASKELL__ >= 702 {-# LANGUAGE Trustworthy #-} -- Imports internal modules -#endif -- | -- Module : Data.Attoparsec.Combinator -- Copyright : Daan Leijen 1999-2001, Bryan O'Sullivan 2007-2015 diff --git a/Data/Attoparsec/Text.hs b/Data/Attoparsec/Text.hs index bb8ef29..da59ecf 100644 --- a/Data/Attoparsec/Text.hs +++ b/Data/Attoparsec/Text.hs @@ -1,7 +1,5 @@ {-# LANGUAGE BangPatterns, CPP, FlexibleInstances, TypeSynonymInstances #-} -#if __GLASGOW_HASKELL__ >= 702 {-# LANGUAGE Trustworthy #-} -- Imports internal modules -#endif {-# OPTIONS_GHC -fno-warn-warnings-deprecations #-} -- | diff --git a/Data/Attoparsec/Text/Lazy.hs b/Data/Attoparsec/Text/Lazy.hs index 79ac057..7dcb369 100644 --- a/Data/Attoparsec/Text/Lazy.hs +++ b/Data/Attoparsec/Text/Lazy.hs @@ -1,7 +1,5 @@ {-# LANGUAGE CPP #-} -#if __GLASGOW_HASKELL__ >= 702 {-# LANGUAGE Trustworthy #-} -- Imports internal modules -#endif {-# OPTIONS_GHC -fno-warn-warnings-deprecations #-} -- | diff --git a/Data/Attoparsec/Zepto.hs b/Data/Attoparsec/Zepto.hs index da2c244..ffede9c 100644 --- a/Data/Attoparsec/Zepto.hs +++ b/Data/Attoparsec/Zepto.hs @@ -1,7 +1,5 @@ {-# LANGUAGE CPP #-} -#if __GLASGOW_HASKELL__ >= 702 {-# LANGUAGE Trustworthy #-} -- Data.ByteString.Unsafe -#endif {-# LANGUAGE BangPatterns #-} -- | diff --git a/attoparsec.cabal b/attoparsec.cabal index 6793556..f04b41e 100644 --- a/attoparsec.cabal +++ b/attoparsec.cabal @@ -78,11 +78,7 @@ library scientific >= 0.3.1 && < 0.4, transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.7, text >= 1.1.1.3, - ghc-prim < 0.14, attoparsec-internal - if impl(ghc < 7.4) - build-depends: - bytestring < 0.10.4.0 if !impl(ghc >= 8.0) -- Data.Semigroup && Control.Monad.Fail are available in base-4.9+ @@ -195,7 +191,6 @@ benchmark attoparsec-benchmarks deepseq >= 1.1, directory, filepath, - ghc-prim, http-types, parsec >= 3.1.2, scientific, diff --git a/benchmarks/Benchmarks.hs b/benchmarks/Benchmarks.hs index da0f73f..70e4328 100644 --- a/benchmarks/Benchmarks.hs +++ b/benchmarks/Benchmarks.hs @@ -119,8 +119,3 @@ quotedString = AB.scan False $ \s c -> if s then Just False else if c == doubleQuote then Nothing else Just (c == backslash) - -#if !MIN_VERSION_base(4,5,0) -unsafeShiftL :: Bits a => a -> Int -> a -unsafeShiftL = shiftL -#endif diff --git a/benchmarks/warp-3.0.1.1/Network/Wai/Handler/Warp/ReadInt.hs b/benchmarks/warp-3.0.1.1/Network/Wai/Handler/Warp/ReadInt.hs index 56b7dd7..c982e15 100644 --- a/benchmarks/warp-3.0.1.1/Network/Wai/Handler/Warp/ReadInt.hs +++ b/benchmarks/warp-3.0.1.1/Network/Wai/Handler/Warp/ReadInt.hs @@ -17,8 +17,7 @@ module Network.Wai.Handler.Warp.ReadInt ( import Data.ByteString (ByteString) import qualified Data.ByteString as S import Data.Int (Int64) -import GHC.Prim -import GHC.Types +import GHC.Exts import GHC.Word {-# INLINE readInt #-}