summaryrefslogtreecommitdiff
path: root/src/compiler/GF/Compile
diff options
context:
space:
mode:
authorAndreas Källberg <anka.213@gmail.com>2020-08-05 16:51:24 +0200
committerAndreas Källberg <anka.213@gmail.com>2020-08-05 18:48:24 +0200
commitb8812b54b2dd70df1038a5cd953b4bbb8ac1e9b4 (patch)
tree1e61a2cd878ddf124d83903cdb63f9f5e9f48725 /src/compiler/GF/Compile
parent251845f83ea52965b5205fd231ffa2c87bb34de6 (diff)
fix newer ghc: Don't try to be backwards compatible
Diffstat (limited to 'src/compiler/GF/Compile')
-rw-r--r--src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs b/src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs
index fab3173dc..3b9e62d04 100644
--- a/src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs
+++ b/src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs
@@ -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