Merge pull request #37 from gelisam/gelisam/ghc-9.0

Support for ghc-9.0

Author: gelisam

.github/workflows/ci.yml renamed to .github/workflows/haskell.yml

@@ -65,13 +65,22 @@ jobs:
     strategy:
       matrix:
         include:
-          # Check that our upper bounds are correct by building with the latest
-          # version of everything. We use cabal because it uses the latest
-          # versions of our dependencies allowed by our upper bounds.
+          # The purpose of that section is two-fold. First, because we are
+          # using cabal and not stack, cabal will pick the most recent version
+          # of our dependencies which has been released. This way, if a
+          # dependency releases a breaking change, the next monthly CI will
+          # pick that version and notify us if we are affected by the change.
           #
-          # TODO: switch back to "ghc: latest" once we support ghc-9.0
-          - name: newest
-            ghc: "8.10"
+          # Second, since this project is a ghc plugin, we rely on details of
+          # the GHC library which change between versions. It is thus quite
+          # easy to accidentally make a change which works for the latest
+          # version of GHC but not with older versions. CI should thus test all
+          # the supported GHC versions.
+          - name: ghc-8.10
+            ghc: "8.10.7"
+            os: ubuntu-latest
+          - name: ghc-9.0
+            ghc: "9.0.2"
             os: ubuntu-latest
 
     steps:
@@ -118,7 +127,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - ghc: "8.10"
+          - ghc: "9.0"
             os: ubuntu-latest
 
     steps:

package.yaml

@@ -18,14 +18,18 @@ extra-source-files:
 # for release
 ghc-options: -W -Wall
 
+tested-with:
+  - GHC == 9.0.2
+  - GHC == 8.10.7
+
 dependencies:
   - base >= 4.12 && < 5
   - ghc-prim >= 0.5.3
 
 library:
   source-dirs:      src
   dependencies:
-    - ghc >= 8.10.2 && < 9.0
+    - ghc >= 8.10.2 && <9.1
     - containers >= 0.6.2.1
     - term-rewriting >= 0.3.0.1
     - transformers >= 0.5.6.2

src/TypeLevel/Rewrite.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE LambdaCase, OverloadedStrings, RecordWildCards, ViewPatterns #-}
+{-# LANGUAGE CPP, LambdaCase, OverloadedStrings, RecordWildCards, ViewPatterns #-}
 module TypeLevel.Rewrite (plugin) where
 
 import Control.Monad
@@ -8,6 +8,17 @@ import Data.Foldable
 import Data.Traversable
 
 -- GHC API
+#if MIN_VERSION_ghc(9,0,0)
+import GHC.Core.Coercion (Role(Representational), mkUnivCo)
+import GHC.Tc.Types.Constraint (CtEvidence(ctev_loc), Ct, ctEvExpr, ctLoc, mkNonCanonical)
+import GHC.Plugins (PredType, SDoc, eqType, fsep, ppr)
+import GHC.Plugins (Plugin(pluginRecompile, tcPlugin), CommandLineOption, defaultPlugin, purePlugin)
+import GHC.Tc.Types.Evidence (EvExpr, EvTerm, evCast)
+import GHC.Tc.Plugin (newWanted)
+import GHC.Core.TyCo.Rep (UnivCoProvenance(PluginProv))
+import GHC.Plugins (synTyConDefn_maybe)
+import GHC.Tc.Types (TcPluginResult(..), TcPluginM, ErrCtxt, pushErrCtxtSameOrigin, TcPlugin(..))
+#else
 import Coercion (Role(Representational), mkUnivCo)
 import Constraint (CtEvidence(ctev_loc), Ct, ctEvExpr, ctLoc, mkNonCanonical)
 import GhcPlugins (PredType, SDoc, eqType, fsep, ppr)
@@ -17,6 +28,7 @@ import TcPluginM (newWanted)
 import TcRnTypes
 import TyCoRep (UnivCoProvenance(PluginProv))
 import TyCon (synTyConDefn_maybe)
+#endif
 
 import TypeLevel.Rewrite.Internal.ApplyRules
 import TypeLevel.Rewrite.Internal.DecomposedConstraint

src/TypeLevel/Rewrite/Internal/ApplyRules.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE LambdaCase, TupleSections, ViewPatterns #-}
+{-# LANGUAGE CPP, LambdaCase, TupleSections, ViewPatterns #-}
 {-# OPTIONS -Wno-name-shadowing #-}
 module TypeLevel.Rewrite.Internal.ApplyRules where
 
@@ -13,7 +13,11 @@ import Data.Traversable
 import qualified Data.Map as Map
 
 -- GHC API
+#if MIN_VERSION_ghc(9,0,0)
+import GHC.Plugins (TyVar)
+#else
 import Type (TyVar)
+#endif
 
 -- term-rewriting API
 import Data.Rewriting.Rule (Rule(..))

src/TypeLevel/Rewrite/Internal/DecomposedConstraint.hs

@@ -1,12 +1,17 @@
-{-# LANGUAGE DeriveFunctor, DeriveFoldable, DeriveTraversable, LambdaCase, RecordWildCards, ViewPatterns #-}
+{-# LANGUAGE CPP, DeriveFunctor, DeriveFoldable, DeriveTraversable, LambdaCase, RecordWildCards, ViewPatterns #-}
 module TypeLevel.Rewrite.Internal.DecomposedConstraint where
 
 import Control.Applicative
 
 -- GHC API
 import GHC (Class, Type)
+#if MIN_VERSION_ghc(9,0,0)
+import GHC.Tc.Types.Constraint (Ct, ctEvPred, ctEvidence)
+import GHC.Core.Predicate (EqRel(NomEq), Pred(ClassPred, EqPred), classifyPredType, mkClassPred, mkPrimEqPred)
+#else
 import Constraint (Ct, ctEvPred, ctEvidence)
 import Predicate (EqRel(NomEq), Pred(ClassPred, EqPred), classifyPredType, mkClassPred, mkPrimEqPred)
+#endif
 
 
 data DecomposedConstraint a

src/TypeLevel/Rewrite/Internal/Lookup.hs

@@ -1,21 +1,29 @@
-{-# LANGUAGE LambdaCase, ViewPatterns #-}
+{-# LANGUAGE CPP, LambdaCase, ViewPatterns #-}
 module TypeLevel.Rewrite.Internal.Lookup where
 
 import Control.Arrow ((***), first)
 import Data.Tuple (swap)
 
 -- GHC API
-import Finder (cannotFindModule)
 import GHC (DataCon, TyCon, dataConTyCon)
+#if MIN_VERSION_ghc(9,0,0)
+import GHC.Driver.Finder (cannotFindModule)
+import GHC (Module, ModuleName, mkModuleName)
+import GHC.Plugins (mkDataOcc, mkTcOcc)
+import GHC.Utils.Panic (panicDoc)
+import GHC.Tc.Plugin
+  ( FindResult(Found), TcPluginM, findImportedModule, lookupOrig, tcLookupDataCon, tcLookupTyCon
+  , unsafeTcPluginTcM
+  )
+import GHC.Tc.Solver.Monad (getDynFlags)
+#else
+import Finder (cannotFindModule)
 import Module (Module, ModuleName, mkModuleName)
 import OccName (mkDataOcc, mkTcOcc)
 import Panic (panicDoc)
 import TcPluginM
-  ( FindResult(Found), TcPluginM, findImportedModule, lookupOrig, tcLookupDataCon, tcLookupTyCon
-  , unsafeTcPluginTcM
-  )
 import TcSMonad (getDynFlags)
-
+#endif
 
 lookupModule
   :: String  -- ^ module name

src/TypeLevel/Rewrite/Internal/PrettyPrint.hs

@@ -1,12 +1,18 @@
-{-# LANGUAGE LambdaCase, RecordWildCards #-}
+{-# LANGUAGE CPP, LambdaCase, RecordWildCards #-}
 module TypeLevel.Rewrite.Internal.PrettyPrint where
 
 import Data.List (intercalate)
 
 -- GHC API
+#if MIN_VERSION_ghc(9,0,0)
+import GHC.Utils.Outputable (ppr, showSDocUnsafe)
+import GHC.Plugins (TyCon)
+import GHC.Plugins (TyVar, Type)
+#else
 import Outputable (ppr, showSDocUnsafe)
 import TyCon (TyCon)
 import Type (TyVar, Type)
+#endif
 
 -- term-rewriting API
 import Data.Rewriting.Rule (Rule(..))

src/TypeLevel/Rewrite/Internal/TypeEq.hs

@@ -1,8 +1,13 @@
+{-# LANGUAGE CPP #-}
 module TypeLevel.Rewrite.Internal.TypeEq where
 
 import Data.Function
 
+#if MIN_VERSION_ghc(9,0,0)
+import GHC.Plugins (Type, eqType)
+#else
 import GhcPlugins (Type, eqType)
+#endif
 
 
 -- | A newtype around 'Type' which has an 'Eq' instance.

src/TypeLevel/Rewrite/Internal/TypeNode.hs

@@ -1,9 +1,14 @@
-{-# LANGUAGE ViewPatterns #-}
+{-# LANGUAGE CPP, ViewPatterns #-}
 module TypeLevel.Rewrite.Internal.TypeNode where
 
 -- GHC API
+#if MIN_VERSION_ghc(9,0,0)
+import GHC (TyCon)
+import GHC.Plugins (Type, isNumLitTy, isStrLitTy, mkTyConApp, splitTyConApp_maybe)
+#else
 import TyCon (TyCon)
 import Type (Type, isNumLitTy, isStrLitTy, mkTyConApp, splitTyConApp_maybe)
+#endif
 
 import TypeLevel.Rewrite.Internal.TypeEq
 

src/TypeLevel/Rewrite/Internal/TypeRule.hs

@@ -1,11 +1,17 @@
-{-# LANGUAGE LambdaCase, ViewPatterns #-}
+{-# LANGUAGE CPP, LambdaCase, ViewPatterns #-}
 {-# OPTIONS -Wno-name-shadowing #-}
 module TypeLevel.Rewrite.Internal.TypeRule where
 
 -- GHC API
+#if MIN_VERSION_ghc(9,0,0)
+import GHC.Plugins (getOccString)
+import GHC.Core.Predicate (mkPrimEqPred)
+import GHC.Plugins (TyVar, Type, mkTyVarTy)
+#else
 import Name (getOccString)
 import Predicate (mkPrimEqPred)
 import Type (TyVar, Type, mkTyVarTy)
+#endif
 
 -- term-rewriting API
 import Data.Rewriting.Rule (Rule(..))