diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-31 13:47:43 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-31 22:35:50 +0100 |
| commit | 2f923ce2ab8bad6d01645c735c81bbf1b9ff1e05 (patch) | |
| tree | 8a21936336868ae1bdaf5b10eb8a1d58480a4727 /libraries | |
| parent | 0d20737860c29169d89c1d5ea728f3848cc28564 (diff) | |
| download | haskell-2f923ce2ab8bad6d01645c735c81bbf1b9ff1e05.tar.gz | |
Drop pre-AMP compatibility CPP conditionals
Since GHC 8.1/8.2 only needs to be bootstrap-able by GHC 7.10 and
GHC 8.0 (and GHC 8.2), we can now finally drop all that pre-AMP
compatibility CPP-mess for good!
Reviewers: austin, goldfire, bgamari
Subscribers: goldfire, thomie, erikd
Differential Revision: https://phabricator.haskell.org/D1724
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/template-haskell/Language/Haskell/TH/PprLib.hs | 5 | ||||
| -rw-r--r-- | libraries/template-haskell/Language/Haskell/TH/Syntax.hs | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/libraries/template-haskell/Language/Haskell/TH/PprLib.hs b/libraries/template-haskell/Language/Haskell/TH/PprLib.hs index acef3274b5..594d7dc54d 100644 --- a/libraries/template-haskell/Language/Haskell/TH/PprLib.hs +++ b/libraries/template-haskell/Language/Haskell/TH/PprLib.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE CPP, FlexibleInstances #-} +{-# LANGUAGE FlexibleInstances #-} -- | Monadic front-end to Text.PrettyPrint @@ -41,9 +41,6 @@ import qualified Text.PrettyPrint as HPJ import Control.Monad (liftM, liftM2, ap) import Language.Haskell.TH.Lib.Map ( Map ) import qualified Language.Haskell.TH.Lib.Map as Map ( lookup, insert, empty ) -#if __GLASGOW_HASKELL__ < 709 -import Control.Applicative( Applicative(..) ) -#endif infixl 6 <> infixl 6 <+> diff --git a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs index ea670b3678..becbbd6d7a 100644 --- a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs +++ b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs @@ -30,9 +30,6 @@ module Language.Haskell.TH.Syntax ) where import Data.Data hiding (Fixity(..)) -#if __GLASGOW_HASKELL__ < 709 -import Control.Applicative( Applicative(..) ) -#endif import Data.IORef import System.IO.Unsafe ( unsafePerformIO ) import Control.Monad (liftM) |