Commit 5695bc7e authored by Ben Gamari's avatar Ben Gamari 🐢

Add ghc-tcplugins-extra-0.3.patch

parent 5882f071
......@@ -30,10 +30,43 @@ index 95e7226..3838668 100644
default-language: Haskell2010
other-extensions: CPP
diff --git a/src/GHC/TcPluginM/Extra.hs b/src/GHC/TcPluginM/Extra.hs
index 2f95012..37f770d 100644
index 2f95012..8a8720e 100644
--- a/src/GHC/TcPluginM/Extra.hs
+++ b/src/GHC/TcPluginM/Extra.hs
@@ -371,8 +371,16 @@ substType _subst t@(ForAllTy _tv _ty) =
@@ -75,9 +75,14 @@ import TcRnTypes (Ct, CtEvidence (..), CtLoc, TcIdBinder (..), TcLclEnv (..),
import TcPluginM (FindResult (..), TcPluginM, findImportedModule, lookupOrig,
tcPluginTrace)
import qualified TcPluginM
+#if __GLASGOW_HASKELL__ >= 809
+import Constraint (CtEvidence (..), CtLoc)
+import TcRnTypes (TcPlugin (..), TcPluginResult (..))
+#else
import TcRnTypes (CtEvidence (..), CtLoc,
TcPlugin (..), TcPluginResult (..))
#endif
+#endif
#if __GLASGOW_HASKELL__ < 802
import TcPluginM (tcPluginIO)
#endif
@@ -93,9 +98,17 @@ import Control.Arrow (first, second)
import Data.Function (on)
import Data.List (groupBy, partition, sortOn)
import Data.Maybe (mapMaybe)
+#if __GLASGOW_HASKELL__ >= 809
+import Constraint (Ct (..), ctLoc, ctEvId, mkNonCanonical)
+#else
import TcRnTypes (Ct (..), ctLoc, ctEvId, mkNonCanonical)
+#endif
import TcType (TcTyVar, TcType)
+#if __GLASGOW_HASKELL__ >= 809
+import Coercion (mkPrimEqPred)
+#else
import Type (mkPrimEqPred)
+#endif
import TyCoRep (Type (..))
#endif
@@ -371,8 +384,16 @@ substType _subst t@(ForAllTy _tv _ty) =
-- TODO: Is it safe to do "dumb" substitution under binders?
-- ForAllTy tv (substType subst ty)
t
......
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