Commit 0018ea7e authored by Ben Gamari's avatar Ben Gamari 🐢

Update patches/ghc-typelits-extra-0.3.1.patch

parent 662c8f0c
diff --git a/src/GHC/TypeLits/Extra/Solver.hs b/src/GHC/TypeLits/Extra/Solver.hs
index 2a978ba..39a018a 100644
index 2a978ba..1d140ed 100644
--- a/src/GHC/TypeLits/Extra/Solver.hs
+++ b/src/GHC/TypeLits/Extra/Solver.hs
@@ -42,9 +42,8 @@ import TcEvidence (EvTerm)
@@ -40,12 +40,19 @@ import Plugins (purePlugin)
#endif
import TcEvidence (EvTerm)
import TcPluginM (TcPluginM, tcLookupTyCon, tcPluginTrace)
import TcRnTypes (Ct, TcPlugin(..), TcPluginResult (..), ctEvidence, ctEvPred,
isWantedCt)
-import TcRnTypes (Ct, TcPlugin(..), TcPluginResult (..), ctEvidence, ctEvPred,
- isWantedCt)
-import TcType (typeKind)
+import TcRnTypes (TcPlugin(..), TcPluginResult (..))
+
+#if MIN_VERSION_ghc(8,9,0)
+import Constraint (Ct, ctEvidence, ctEvPred, isWantedCt)
+import Predicate (EqRel (NomEq), Pred (EqPred), classifyPredType)
+import Type (Kind, eqType, typeKind)
+import TyCoRep (Type (..))
+#else
+import TcRnTypes (Ct, ctEvidence, ctEvPred, isWantedCt)
import Type (EqRel (NomEq), Kind, PredTree (EqPred), classifyPredType,
- eqType)
+ eqType, typeKind)
import TyCoRep (Type (..))
+#endif
import TysWiredIn (typeNatKind, promotedTrueDataCon, promotedFalseDataCon)
import TcTypeNats (typeNatLeqTyCon)
#if MIN_VERSION_ghc(8,4,0)
diff --git a/src/GHC/TypeLits/Extra/Solver/Unify.hs b/src/GHC/TypeLits/Extra/Solver/Unify.hs
index 0bd0159..89c6438 100644
--- a/src/GHC/TypeLits/Extra/Solver/Unify.hs
+++ b/src/GHC/TypeLits/Extra/Solver/Unify.hs
@@ -26,7 +26,11 @@ import qualified GHC.TypeLits.Normalise.Unify as Normalise
-- GHC API
import Outputable (Outputable (..), ($$), text)
import TcPluginM (TcPluginM, matchFam, tcPluginTrace)
+#if MIN_VERSION_ghc(8,9,0)
+import Constraint (Ct)
+#else
import TcRnMonad (Ct)
+#endif
import TcTypeNats (typeNatExpTyCon)
import Type (TyVar, coreView)
import TyCoRep (Type (..), TyLit (..))
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