Update GHC-api's paths

Author: junjihashimoto

src/TypeLevel/Rewrite.hs

@@ -8,15 +8,15 @@ import Data.Foldable
 import Data.Traversable
 
 -- GHC API
-import Coercion (Role(Representational), mkUnivCo)
-import Constraint (CtEvidence(ctev_loc), Ct, ctEvExpr, ctLoc, mkNonCanonical)
-import GhcPlugins (PredType, SDoc, eqType, fsep, ppr)
-import Plugins (Plugin(pluginRecompile, tcPlugin), CommandLineOption, defaultPlugin, purePlugin)
-import TcEvidence (EvExpr, EvTerm, evCast)
-import TcPluginM (newWanted)
-import TcRnTypes
-import TyCoRep (UnivCoProvenance(PluginProv))
-import TyCon (synTyConDefn_maybe)
+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(..))
 
 import TypeLevel.Rewrite.Internal.ApplyRules
 import TypeLevel.Rewrite.Internal.DecomposedConstraint

src/TypeLevel/Rewrite/Internal/ApplyRules.hs

@@ -13,7 +13,7 @@ import Data.Traversable
 import qualified Data.Map as Map
 
 -- GHC API
-import Type (TyVar)
+import GHC.Plugins (TyVar)
 
 -- term-rewriting API
 import Data.Rewriting.Rule (Rule(..))

src/TypeLevel/Rewrite/Internal/DecomposedConstraint.hs

@@ -5,8 +5,8 @@ import Control.Applicative
 
 -- GHC API
 import GHC (Class, Type)
-import Constraint (Ct, ctEvPred, ctEvidence)
-import Predicate (EqRel(NomEq), Pred(ClassPred, EqPred), classifyPredType, mkClassPred, mkPrimEqPred)
+import GHC.Tc.Types.Constraint (Ct, ctEvPred, ctEvidence)
+import GHC.Core.Predicate (EqRel(NomEq), Pred(ClassPred, EqPred), classifyPredType, mkClassPred, mkPrimEqPred)
 
 
 data DecomposedConstraint a

src/TypeLevel/Rewrite/Internal/Lookup.hs

@@ -5,16 +5,16 @@ import Control.Arrow ((***), first)
 import Data.Tuple (swap)
 
 -- GHC API
-import Finder (cannotFindModule)
+import GHC.Driver.Finder (cannotFindModule)
 import GHC (DataCon, TyCon, dataConTyCon)
-import Module (Module, ModuleName, mkModuleName)
-import OccName (mkDataOcc, mkTcOcc)
-import Panic (panicDoc)
-import TcPluginM
+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 TcSMonad (getDynFlags)
+import GHC.Tc.Solver.Monad (getDynFlags)
 
 
 lookupModule

src/TypeLevel/Rewrite/Internal/PrettyPrint.hs

@@ -4,9 +4,9 @@ module TypeLevel.Rewrite.Internal.PrettyPrint where
 import Data.List (intercalate)
 
 -- GHC API
-import Outputable (ppr, showSDocUnsafe)
-import TyCon (TyCon)
-import Type (TyVar, Type)
+import GHC.Utils.Outputable (ppr, showSDocUnsafe)
+import GHC.Plugins (TyCon)
+import GHC.Plugins (TyVar, Type)
 
 -- term-rewriting API
 import Data.Rewriting.Rule (Rule(..))

src/TypeLevel/Rewrite/Internal/TypeEq.hs

@@ -2,7 +2,7 @@ module TypeLevel.Rewrite.Internal.TypeEq where
 
 import Data.Function
 
-import GhcPlugins (Type, eqType)
+import GHC.Plugins (Type, eqType)
 
 
 -- | A newtype around 'Type' which has an 'Eq' instance.

src/TypeLevel/Rewrite/Internal/TypeNode.hs

@@ -2,8 +2,8 @@
 module TypeLevel.Rewrite.Internal.TypeNode where
 
 -- GHC API
-import TyCon (TyCon)
-import Type (Type, isNumLitTy, isStrLitTy, mkTyConApp, splitTyConApp_maybe)
+import GHC (TyCon)
+import GHC.Plugins (Type, isNumLitTy, isStrLitTy, mkTyConApp, splitTyConApp_maybe)
 
 import TypeLevel.Rewrite.Internal.TypeEq
 

src/TypeLevel/Rewrite/Internal/TypeRule.hs

@@ -3,9 +3,9 @@
 module TypeLevel.Rewrite.Internal.TypeRule where
 
 -- GHC API
-import Name (getOccString)
-import Predicate (mkPrimEqPred)
-import Type (TyVar, Type, mkTyVarTy)
+import GHC.Plugins (getOccString)
+import GHC.Core.Predicate (mkPrimEqPred)
+import GHC.Plugins (TyVar, Type, mkTyVarTy)
 
 -- term-rewriting API
 import Data.Rewriting.Rule (Rule(..))

src/TypeLevel/Rewrite/Internal/TypeTemplate.hs

@@ -2,7 +2,7 @@
 module TypeLevel.Rewrite.Internal.TypeTemplate where
 
 -- GHC API
-import Type (TyVar, Type, getTyVar_maybe)
+import GHC.Plugins (TyVar, Type, getTyVar_maybe)
 
 -- term-rewriting API
 import Data.Rewriting.Term (Term(Fun, Var))

src/TypeLevel/Rewrite/Internal/TypeTerm.hs

@@ -2,7 +2,7 @@
 module TypeLevel.Rewrite.Internal.TypeTerm where
 
 -- GHC API
-import Type (Type, mkTyConApp)
+import GHC.Plugins (Type, mkTyConApp)
 
 -- term-rewriting API
 import Data.Rewriting.Term (Term(Fun, Var))