fix newer ghc: Don't try to be backwards compatible

This commit is contained in:
Andreas Källberg
2020-08-05 16:51:24 +02:00
parent 251845f83e
commit b8812b54b2
4 changed files with 6 additions and 37 deletions

View File

@@ -19,10 +19,6 @@ import GF.Text.Pretty
import Data.List (nub, (\\), tails)
import qualified Data.IntMap as IntMap
import Data.Maybe(fromMaybe,isNothing)
#if !MIN_VERSION_base(4,11,0)
-- Control.Monad.Fail import is redundant since GHC 8.8.1
import qualified Control.Monad.Fail as Fail
#endif
checkLType :: GlobalEnv -> Term -> Type -> Check (Term, Type)
checkLType ge t ty = runTcM $ do
@@ -651,16 +647,8 @@ instance Monad TcM where
TcOk x ms msgs -> unTcM (g x) ms msgs
TcFail msgs -> TcFail msgs)
#if !(MIN_VERSION_base(4,13,0))
instance MonadFail TcM where
fail = tcError . pp
#endif
instance Fail.MonadFail TcM where
fail = tcError . pp
-- Control.Monad.Fail import will become redundant in GHC 8.8+
import qualified Control.Monad.Fail as Fail
instance Applicative TcM where