Commit cf6b4d1c authored by Herbert Valerio Riedel's avatar Herbert Valerio Riedel 🕺

Remove now redundant CPP

Resulting from requiring to boot with GHC 8.0 or later
parent 22f11f19
...@@ -56,9 +56,7 @@ import Coercion (mkUnbranchedAxInstCo,mkSymCo,Role(..)) ...@@ -56,9 +56,7 @@ import Coercion (mkUnbranchedAxInstCo,mkSymCo,Role(..))
import Control.Applicative ( Alternative(..) ) import Control.Applicative ( Alternative(..) )
import Control.Monad import Control.Monad
#if __GLASGOW_HASKELL__ > 710
import qualified Control.Monad.Fail as MonadFail import qualified Control.Monad.Fail as MonadFail
#endif
import Data.Bits as Bits import Data.Bits as Bits
import qualified Data.ByteString as BS import qualified Data.ByteString as BS
import Data.Int import Data.Int
...@@ -651,10 +649,8 @@ instance Monad RuleM where ...@@ -651,10 +649,8 @@ instance Monad RuleM where
Just r -> runRuleM (g r) dflags iu e Just r -> runRuleM (g r) dflags iu e
fail _ = mzero fail _ = mzero
#if __GLASGOW_HASKELL__ > 710
instance MonadFail.MonadFail RuleM where instance MonadFail.MonadFail RuleM where
fail _ = mzero fail _ = mzero
#endif
instance Alternative RuleM where instance Alternative RuleM where
empty = RuleM $ \_ _ _ -> Nothing empty = RuleM $ \_ _ _ -> Nothing
......
...@@ -7,9 +7,7 @@ ...@@ -7,9 +7,7 @@
{-# LANGUAGE CPP #-} {-# LANGUAGE CPP #-}
-- The default is a bit too low for the quite large primOpInfo definition -- The default is a bit too low for the quite large primOpInfo definition
#if __GLASGOW_HASKELL__ >= 801
{-# OPTIONS_GHC -fmax-pmcheck-iterations=10000000 #-} {-# OPTIONS_GHC -fmax-pmcheck-iterations=10000000 #-}
#endif
module PrimOp ( module PrimOp (
PrimOp(..), PrimOpVecCat(..), allThePrimOps, PrimOp(..), PrimOpVecCat(..), allThePrimOps,
......
{-# LANGUAGE RoleAnnotations #-} {-# LANGUAGE RoleAnnotations #-}
{-# LANGUAGE TupleSections #-} {-# LANGUAGE TupleSections #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE DeriveFunctor #-}
{-# OPTIONS_GHC -Wall #-} {-# OPTIONS_GHC -Wall #-}
...@@ -50,9 +49,7 @@ import UniqFM ...@@ -50,9 +49,7 @@ import UniqFM
import Unique import Unique
import Outputable import Outputable
#if __GLASGOW_HASKELL__ > 710
import Data.Semigroup ( Semigroup(..) ) import Data.Semigroup ( Semigroup(..) )
#endif
import Data.Coerce import Data.Coerce
import Data.Maybe import Data.Maybe
import Data.Typeable import Data.Typeable
...@@ -63,10 +60,8 @@ newtype UniqMap k a = UniqMap (UniqFM (k, a)) ...@@ -63,10 +60,8 @@ newtype UniqMap k a = UniqMap (UniqFM (k, a))
deriving (Data, Eq, Functor, Typeable) deriving (Data, Eq, Functor, Typeable)
type role UniqMap nominal representational type role UniqMap nominal representational
#if __GLASGOW_HASKELL__ > 710
instance Semigroup (UniqMap k a) where instance Semigroup (UniqMap k a) where
(<>) = plusUniqMap (<>) = plusUniqMap
#endif
instance Monoid (UniqMap k a) where instance Monoid (UniqMap k a) where
mempty = emptyUniqMap mempty = emptyUniqMap
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment