diff --git a/ghc-api-compat.cabal b/ghc-api-compat.cabal
index f10b1d1f30386a9ed345f993e1715afc5280e7d5..7ded73d16044aedaf3d977770f4680d11b06becd 100644
--- a/ghc-api-compat.cabal
+++ b/ghc-api-compat.cabal
@@ -167,250 +167,250 @@ library
, GHC.Data.StringBuffer as StringBuffer
, GHC.Data.Tree.OrdList as OrdList
, GHC.Data.TrieMap as TrieMap
- , GHC.Entity.Annotation as Annotations
- , GHC.Entity.Available as Avail
- , GHC.Entity.BasicTypes as BasicTypes
- , GHC.Entity.Class as Class
- , GHC.Entity.ClassInstance as InstEnv
- , GHC.Entity.Coercion as Coercion
- , GHC.Entity.Coercion.Axiom as CoAxiom
- , GHC.Entity.Coercion.Optimise as OptCoercion
- , GHC.Entity.ConstructorLike as ConLike
- , GHC.Entity.CostCentre as CostCentre
- , GHC.Entity.CostCentre.Initialise as ProfInit
- , GHC.Entity.DataConstructor as DataCon
- , GHC.Entity.Demand as Demand
- , GHC.Entity.FamilyInstance as FamInstEnv
- , GHC.Entity.FieldLabel as FieldLabel
- , GHC.Entity.ForeignCall as ForeignCall
- , GHC.Entity.Id as Id
- , GHC.Entity.Id.Info as IdInfo
- , GHC.Entity.Id.Make as MkId
- , GHC.Entity.Kind as Kind
- , GHC.Entity.Literal as Literal
- , GHC.Entity.Module as Module
- , GHC.Entity.Name as Name
- , GHC.Entity.Name.Cache as NameCache
- , GHC.Entity.Name.Environment as NameEnv
- , GHC.Entity.Name.Set as NameSet
- , GHC.Entity.NameShape as NameShape
- , GHC.Entity.OccName as OccName
- , GHC.Entity.PatternSynonym as PatSyn
- , GHC.Entity.RdrName as RdrName
- , GHC.Entity.RepType as RepType
- , GHC.Entity.SrcLoc as SrcLoc
- , GHC.Entity.Symbol as CLabel
- , GHC.Entity.Type as Type
- , GHC.Entity.TypeAndCoercion as TyCoRep
- , GHC.Entity.TypeConstructor as TyCon
- , GHC.Entity.Types as HscTypes
- , GHC.Entity.Unique.DeterFiniteMap as UniqDFM
- , GHC.Entity.Unique.DeterSet as UniqDSet
- , GHC.Entity.Unique.FiniteMap as UniqFM
- , GHC.Entity.Unique.Map as UniqMap
- , GHC.Entity.Unique.Set as UniqSet
- , GHC.Entity.Unique.Supply as UniqSupply
- , GHC.Entity.Var as Var
- , GHC.Entity.Var.Environment as VarEnv
- , GHC.Entity.Var.Free as FV
- , GHC.Entity.Var.Set as VarSet
- , GHC.Entity.Var.UndirectedGraph as UnVarGraph
- , GHC.IR.ByteCode.Assembler as ByteCodeAsm
- , GHC.IR.ByteCode.InfoTable as ByteCodeItbls
- , GHC.IR.ByteCode.Instruction as ByteCodeInstr
- , GHC.IR.ByteCode.Linker as ByteCodeLink
- , GHC.IR.ByteCode.Types as ByteCodeTypes
- , GHC.IR.Cmm.Analyser.Lint as CmmLint
- , GHC.IR.Cmm.Analyser.Liveness as CmmLive
- , GHC.IR.Cmm.Lexer as CmmLex
- , GHC.IR.Cmm.Parser as CmmParse
- , GHC.IR.Cmm.Parser.Monad as CmmMonad
- , GHC.IR.Cmm.Pipeline as CmmPipeline
- , GHC.IR.Cmm.Printer as PprCmm
- , GHC.IR.Cmm.Printer.Declaration as PprCmmDecl
- , GHC.IR.Cmm.Printer.Expression as PprCmmExpr
- , GHC.IR.Cmm.Syntax as Cmm
- , GHC.IR.Cmm.Syntax.BlockId as BlockId
- , GHC.IR.Cmm.Syntax.CallConvention as CmmCallConv
- , GHC.IR.Cmm.Syntax.DebugBlock as Debug
- , GHC.IR.Cmm.Syntax.Expression as CmmExpr
- , GHC.IR.Cmm.Syntax.Graph as MkGraph
- , GHC.IR.Cmm.Syntax.MachinePrimOps as CmmMachOp
- , GHC.IR.Cmm.Syntax.Node as CmmNode
- , GHC.IR.Cmm.Syntax.Type as CmmType
- , GHC.IR.Cmm.Transformer.CommonBlockElim as CmmCommonBLockElim
- , GHC.IR.Cmm.Transformer.ConstantFolder as CmmOpt
- , GHC.IR.Cmm.Transformer.Dataflow as Hoopl
- , GHC.IR.Cmm.Transformer.Dataflow.Hoopl as Hoopl.Dataflow
- , GHC.IR.Cmm.Transformer.InfoTableBuilder as CmmBuildInfoTables
- , GHC.IR.Cmm.Transformer.LayoutStack as CmmLayoutStack
- , GHC.IR.Cmm.Transformer.ProcPoint as CmmProcPoint
- , GHC.IR.Cmm.Transformer.Shortcutter as CmmContFlowOpt
- , GHC.IR.Cmm.Transformer.Sinker as CmmSink
- , GHC.IR.Cmm.Transformer.Switch as CmmSwitch
- , GHC.IR.Cmm.Transformer.Switch.Implement as CmmImplementSwitchPlans
- , GHC.IR.Cmm.Utils as CmmUtils
- , GHC.IR.Core.Analyser.Arity as CoreArity
- , GHC.IR.Core.Analyser.CallArity as CallArity
- , GHC.IR.Core.Analyser.Demand as DmdAnal
- , GHC.IR.Core.Analyser.FreeVars as CoreFVs
- , GHC.IR.Core.Analyser.Lint as CoreLint
- , GHC.IR.Core.Analyser.Occurence as OccurAnal
- , GHC.IR.Core.Analyser.Stats as CoreStats
- , GHC.IR.Core.Pipeline as CoreMonad
- , GHC.IR.Core.Printer as PprCore
- , GHC.IR.Core.Syntax as CoreSyn
- , GHC.IR.Core.Syntax.Force as CoreSeq
- , GHC.IR.Core.Syntax.Make as MkCore
- , GHC.IR.Core.Transformer.CommonSubExpr as CSE
- , GHC.IR.Core.Transformer.ConstantFolder as PrelRules
- , GHC.IR.Core.Transformer.FloatIn as FloatIn
- , GHC.IR.Core.Transformer.FloatOut as FloatOut
- , GHC.IR.Core.Transformer.Inliner as CoreUnfold
- , GHC.IR.Core.Transformer.LevelSetter as SetLevels
- , GHC.IR.Core.Transformer.LiberateCase as LiberateCase
- , GHC.IR.Core.Transformer.Pipeline as SimplCore
- , GHC.IR.Core.Transformer.Rules as Rules
- , GHC.IR.Core.Transformer.Simple as CoreOpt
- , GHC.IR.Core.Transformer.Simplifier as Simplify
- , GHC.IR.Core.Transformer.Simplifier.Environment as SimplEnv
- , GHC.IR.Core.Transformer.Simplifier.Monad as SimplMonad
- , GHC.IR.Core.Transformer.Simplifier.Utils as SimplUtils
- , GHC.IR.Core.Transformer.Specialiser as Specialise
- , GHC.IR.Core.Transformer.Specialiser.Constructor as SpecConstr
- , GHC.IR.Core.Transformer.StaticArgument as SAT
- , GHC.IR.Core.Transformer.Substitution as CoreSubst
- , GHC.IR.Core.Transformer.Tidier as CoreTidy
- , GHC.IR.Core.Transformer.Vectoriser as Vectorise
- , GHC.IR.Core.Transformer.Vectoriser.Builtins as Vectorise.Builtins
- , GHC.IR.Core.Transformer.Vectoriser.Builtins.Base as Vectorise.Builtins.Base
- , GHC.IR.Core.Transformer.Vectoriser.Builtins.Initialise as Vectorise.Builtins.Initialise
- , GHC.IR.Core.Transformer.Vectoriser.Convert as Vectorise.Convert
- , GHC.IR.Core.Transformer.Vectoriser.Env as Vectorise.Env
- , GHC.IR.Core.Transformer.Vectoriser.Exp as Vectorise.Exp
- , GHC.IR.Core.Transformer.Vectoriser.Generic.Description as Vectorise.Generic.Description
- , GHC.IR.Core.Transformer.Vectoriser.Generic.PADict as Vectorise.Generic.PADict
- , GHC.IR.Core.Transformer.Vectoriser.Generic.PAMethods as Vectorise.Generic.PAMethods
- , GHC.IR.Core.Transformer.Vectoriser.Generic.PData as Vectorise.Generic.PData
- , GHC.IR.Core.Transformer.Vectoriser.Monad as Vectorise.Monad
- , GHC.IR.Core.Transformer.Vectoriser.Monad.Base as Vectorise.Monad.Base
- , GHC.IR.Core.Transformer.Vectoriser.Monad.Global as Vectorise.Monad.Global
- , GHC.IR.Core.Transformer.Vectoriser.Monad.InstEnv as Vectorise.Monad.InstEnv
- , GHC.IR.Core.Transformer.Vectoriser.Monad.Local as Vectorise.Monad.Local
- , GHC.IR.Core.Transformer.Vectoriser.Monad.Naming as Vectorise.Monad.Naming
- , GHC.IR.Core.Transformer.Vectoriser.Type.Classify as Vectorise.Type.Classify
- , GHC.IR.Core.Transformer.Vectoriser.Type.Env as Vectorise.Type.Env
- , GHC.IR.Core.Transformer.Vectoriser.Type.TyConDecl as Vectorise.Type.TyConDecl
- , GHC.IR.Core.Transformer.Vectoriser.Type.Type as Vectorise.Type.Type
- , GHC.IR.Core.Transformer.Vectoriser.Utils as Vectorise.Utils
- , GHC.IR.Core.Transformer.Vectoriser.Utils.Base as Vectorise.Utils.Base
- , GHC.IR.Core.Transformer.Vectoriser.Utils.Closure as Vectorise.Utils.Closure
- , GHC.IR.Core.Transformer.Vectoriser.Utils.Hoisting as Vectorise.Utils.Hoisting
- , GHC.IR.Core.Transformer.Vectoriser.Utils.PADict as Vectorise.Utils.PADict
- , GHC.IR.Core.Transformer.Vectoriser.Utils.Poly as Vectorise.Utils.Poly
- , GHC.IR.Core.Transformer.Vectoriser.Var as Vectorise.Var
- , GHC.IR.Core.Transformer.WorkerWrapper as WorkWrap
- , GHC.IR.Core.Transformer.WorkerWrapper.Utils as WwLib
- , GHC.IR.Core.Utils as CoreUtils
- , GHC.IR.Haskell.Analyser.Stats as HscStats
- , GHC.IR.Haskell.Deriver.BasicClasses as TcGenDeriv
- , GHC.IR.Haskell.Deriver.Constraints as TcDerivInfer
- , GHC.IR.Haskell.Deriver.Functor as TcGenFunctor
- , GHC.IR.Haskell.Deriver.Generic as TcGenGenerics
- , GHC.IR.Haskell.Deriver.Typeable as TcTypeable
- , GHC.IR.Haskell.Deriver.Utils as TcDerivUtils
- , GHC.IR.Haskell.Lexer as Lexer
- , GHC.IR.Haskell.Parser as Parser
- , GHC.IR.Haskell.Parser.HeaderInfo as HeaderInfo
- , GHC.IR.Haskell.Parser.Syntax as RdrHsSyn
- , GHC.IR.Haskell.Parser.Utils as HaddockUtils
- , GHC.IR.Haskell.Printer.Dump as HsDumpAst
- , GHC.IR.Haskell.Renamer as RnSource
- , GHC.IR.Haskell.Renamer.Binding as RnBinds
- , GHC.IR.Haskell.Renamer.Documentation as RnHsDoc
- , GHC.IR.Haskell.Renamer.Environment as RnEnv
- , GHC.IR.Haskell.Renamer.Expression as RnExpr
- , GHC.IR.Haskell.Renamer.Fixity as RnFixity
- , GHC.IR.Haskell.Renamer.ImportExport as RnNames
- , GHC.IR.Haskell.Renamer.Pattern as RnPat
- , GHC.IR.Haskell.Renamer.Splice as RnSplice
- , GHC.IR.Haskell.Renamer.Type as RnTypes
- , GHC.IR.Haskell.Renamer.Utils as RnUtils
- , GHC.IR.Haskell.Renamer.Utils.Unbound as RnUnbound
- , GHC.IR.Haskell.Syntax as HsSyn
- , GHC.IR.Haskell.Syntax.Annotation as ApiAnnotation
- , GHC.IR.Haskell.Syntax.Binding as HsBinds
- , GHC.IR.Haskell.Syntax.Declaration as HsDecls
- , GHC.IR.Haskell.Syntax.Documentation as HsDoc
- , GHC.IR.Haskell.Syntax.Expression as HsExpr
- , GHC.IR.Haskell.Syntax.Extension as HsExtension
- , GHC.IR.Haskell.Syntax.ImportExport as HsImpExp
- , GHC.IR.Haskell.Syntax.Literal as HsLit
- , GHC.IR.Haskell.Syntax.Pattern as HsPat
- , GHC.IR.Haskell.Syntax.PlaceHolder as PlaceHolder
- , GHC.IR.Haskell.Syntax.Type as HsTypes
- , GHC.IR.Haskell.TypeChecker as TcRnMonad
- , GHC.IR.Haskell.TypeChecker.Annotation as TcAnnotations
- , GHC.IR.Haskell.TypeChecker.Arrow as TcArrows
- , GHC.IR.Haskell.TypeChecker.Binding as TcBinds
- , GHC.IR.Haskell.TypeChecker.ClassDeclaration as TcClassDcl
- , GHC.IR.Haskell.TypeChecker.Constraint.Canonicaliser as TcCanonical
- , GHC.IR.Haskell.TypeChecker.Constraint.Interact as TcInteract
- , GHC.IR.Haskell.TypeChecker.Constraint.Simplifier as TcSimplify
- , GHC.IR.Haskell.TypeChecker.Constraint.Solver as TcSMonad
- , GHC.IR.Haskell.TypeChecker.Default as TcDefaults
- , GHC.IR.Haskell.TypeChecker.Deriving as TcDeriv
- , GHC.IR.Haskell.TypeChecker.Environment as TcEnv
- , GHC.IR.Haskell.TypeChecker.Error as TcErrors
- , GHC.IR.Haskell.TypeChecker.Evidence as TcEvidence
- , GHC.IR.Haskell.TypeChecker.Export as TcRnExports
- , GHC.IR.Haskell.TypeChecker.Expression as TcExpr
- , GHC.IR.Haskell.TypeChecker.FamilyInstance as FamInst
- , GHC.IR.Haskell.TypeChecker.Flatten as TcFlatten
- , GHC.IR.Haskell.TypeChecker.Foreign as TcForeign
- , GHC.IR.Haskell.TypeChecker.FunctionalDependency as FunDeps
- , GHC.IR.Haskell.TypeChecker.Instance as TcInstDcls
- , GHC.IR.Haskell.TypeChecker.Instantiation as Inst
- , GHC.IR.Haskell.TypeChecker.Matches as TcMatches
- , GHC.IR.Haskell.TypeChecker.Module as TcRnDriver
- , GHC.IR.Haskell.TypeChecker.ModuleSignature as TcBackpack
- , GHC.IR.Haskell.TypeChecker.MutableType as TcMType
- , GHC.IR.Haskell.TypeChecker.Pattern as TcPat
- , GHC.IR.Haskell.TypeChecker.PatternSynonym as TcPatSyn
- , GHC.IR.Haskell.TypeChecker.Rule as TcRules
- , GHC.IR.Haskell.TypeChecker.Signature as TcSigs
- , GHC.IR.Haskell.TypeChecker.Splice as TcSplice
- , GHC.IR.Haskell.TypeChecker.Syntax as TcHsSyn
- , GHC.IR.Haskell.TypeChecker.Type as TcType
- , GHC.IR.Haskell.TypeChecker.TypeAndClassDeclaration as TcTyClsDecls
- , GHC.IR.Haskell.TypeChecker.TypeDeclaration as TcTyDecls
- , GHC.IR.Haskell.TypeChecker.Types as TcRnTypes
- , GHC.IR.Haskell.TypeChecker.Unify as TcUnify
- , GHC.IR.Haskell.TypeChecker.UserType as TcHsType
- , GHC.IR.Haskell.TypeChecker.Validity as TcValidity
- , GHC.IR.Haskell.Utils as HsUtils
- , GHC.IR.Interface.Binary as BinIface
- , GHC.IR.Interface.BuildTypeAndClass as BuildTyCl
- , GHC.IR.Interface.Environment as IfaceEnv
- , GHC.IR.Interface.Loader as LoadIface
- , GHC.IR.Interface.Renamer as RnModIface
- , GHC.IR.Interface.Syntax as IfaceSyn
- , GHC.IR.Interface.Transformer.Tidier as TidyPgm
- , GHC.IR.Interface.TypeChecker as TcIface
- , GHC.IR.Interface.Types as IfaceType
- , GHC.IR.Interface.Utils as MkIface
- , GHC.IR.Llvm.MetaData as Llvm.MetaData
- , GHC.IR.Llvm.Printer as Llvm.PpLlvm
- , GHC.IR.Llvm.Syntax as Llvm.AbsSyn
- , GHC.IR.Llvm.Types as Llvm.Types
- , GHC.IR.Stg.Analyser.Lint as StgLint
- , GHC.IR.Stg.Analyser.Stats as StgStats
- , GHC.IR.Stg.Syntax as StgSyn
- , GHC.IR.Stg.Transformer.CommonSubExpr as StgCse
- , GHC.IR.Stg.Transformer.CostCentreCollector as SCCfinal
- , GHC.IR.Stg.Transformer.Pipeline as SimplStg
- , GHC.IR.Stg.Transformer.Unariser as UnariseStg
- , GHC.IR.Stg.Utils as CgUtils
+ , GHC.Types.Annotation as Annotations
+ , GHC.Types.Available as Avail
+ , GHC.Types.BasicTypes as BasicTypes
+ , GHC.Types.Class as Class
+ , GHC.Types.ClassInstance as InstEnv
+ , GHC.Types.Coercion as Coercion
+ , GHC.Types.Coercion.Axiom as CoAxiom
+ , GHC.Types.Coercion.Optimise as OptCoercion
+ , GHC.Types.ConstructorLike as ConLike
+ , GHC.Types.CostCentre as CostCentre
+ , GHC.Types.CostCentre.Initialise as ProfInit
+ , GHC.Types.DataConstructor as DataCon
+ , GHC.Types.Demand as Demand
+ , GHC.Types.FamilyInstance as FamInstEnv
+ , GHC.Types.FieldLabel as FieldLabel
+ , GHC.Types.ForeignCall as ForeignCall
+ , GHC.Types.Id as Id
+ , GHC.Types.Id.Info as IdInfo
+ , GHC.Types.Id.Make as MkId
+ , GHC.Types.Kind as Kind
+ , GHC.Types.Literal as Literal
+ , GHC.Types.Module as Module
+ , GHC.Types.Name as Name
+ , GHC.Types.Name.Cache as NameCache
+ , GHC.Types.Name.Environment as NameEnv
+ , GHC.Types.Name.Set as NameSet
+ , GHC.Types.NameShape as NameShape
+ , GHC.Types.OccName as OccName
+ , GHC.Types.PatternSynonym as PatSyn
+ , GHC.Types.RdrName as RdrName
+ , GHC.Types.RepType as RepType
+ , GHC.Types.SrcLoc as SrcLoc
+ , GHC.Types.Symbol as CLabel
+ , GHC.Types.Type as Type
+ , GHC.Types.TypeAndCoercion as TyCoRep
+ , GHC.Types.TypeConstructor as TyCon
+ , GHC.Types.Base as HscTypes
+ , GHC.Types.Unique.DeterFiniteMap as UniqDFM
+ , GHC.Types.Unique.DeterSet as UniqDSet
+ , GHC.Types.Unique.FiniteMap as UniqFM
+ , GHC.Types.Unique.Map as UniqMap
+ , GHC.Types.Unique.Set as UniqSet
+ , GHC.Types.Unique.Supply as UniqSupply
+ , GHC.Types.Var as Var
+ , GHC.Types.Var.Environment as VarEnv
+ , GHC.Types.Var.Free as FV
+ , GHC.Types.Var.Set as VarSet
+ , GHC.Types.Var.UndirectedGraph as UnVarGraph
+ , GHC.ByteCode.Assembler as ByteCodeAsm
+ , GHC.ByteCode.InfoTable as ByteCodeItbls
+ , GHC.ByteCode.Instruction as ByteCodeInstr
+ , GHC.ByteCode.Linker as ByteCodeLink
+ , GHC.ByteCode.Types as ByteCodeTypes
+ , GHC.Cmm.Lint as CmmLint
+ , GHC.Cmm.Liveness as CmmLive
+ , GHC.Cmm.Lexer as CmmLex
+ , GHC.Cmm.Parser as CmmParse
+ , GHC.Cmm.Parser.Monad as CmmMonad
+ , GHC.Cmm.Pipeline as CmmPipeline
+ , GHC.Cmm.Printer as PprCmm
+ , GHC.Cmm.Printer.Declaration as PprCmmDecl
+ , GHC.Cmm.Printer.Expression as PprCmmExpr
+ , GHC.Cmm.Syntax as Cmm
+ , GHC.Cmm.Syntax.BlockId as BlockId
+ , GHC.Cmm.Syntax.CallConvention as CmmCallConv
+ , GHC.Cmm.Syntax.DebugBlock as Debug
+ , GHC.Cmm.Syntax.Expression as CmmExpr
+ , GHC.Cmm.Syntax.Graph as MkGraph
+ , GHC.Cmm.Syntax.MachinePrimOps as CmmMachOp
+ , GHC.Cmm.Syntax.Node as CmmNode
+ , GHC.Cmm.Syntax.Type as CmmType
+ , GHC.Cmm.CommonBlockElim as CmmCommonBLockElim
+ , GHC.Cmm.ConstantFolder as CmmOpt
+ , GHC.Cmm.Dataflow as Hoopl
+ , GHC.Cmm.Dataflow.Hoopl as Hoopl.Dataflow
+ , GHC.Cmm.InfoTableBuilder as CmmBuildInfoTables
+ , GHC.Cmm.LayoutStack as CmmLayoutStack
+ , GHC.Cmm.ProcPoint as CmmProcPoint
+ , GHC.Cmm.Shortcutter as CmmContFlowOpt
+ , GHC.Cmm.Sinker as CmmSink
+ , GHC.Cmm.Switch as CmmSwitch
+ , GHC.Cmm.Switch.Implement as CmmImplementSwitchPlans
+ , GHC.Cmm.Utils as CmmUtils
+ , GHC.Core.Arity as CoreArity
+ , GHC.Core.CallArity as CallArity
+ , GHC.Core.Demand as DmdAnal
+ , GHC.Core.FreeVars as CoreFVs
+ , GHC.Core.Lint as CoreLint
+ , GHC.Core.Occurence as OccurAnal
+ , GHC.Core.Stats as CoreStats
+ , GHC.Core.Monad as CoreMonad
+ , GHC.Core.Printer as PprCore
+ , GHC.Core.Syntax as CoreSyn
+ , GHC.Core.Syntax.Force as CoreSeq
+ , GHC.Core.Syntax.Make as MkCore
+ , GHC.Core.CommonSubExpr as CSE
+ , GHC.Core.ConstantFolder as PrelRules
+ , GHC.Core.FloatIn as FloatIn
+ , GHC.Core.FloatOut as FloatOut
+ , GHC.Core.Inliner as CoreUnfold
+ , GHC.Core.LevelSetter as SetLevels
+ , GHC.Core.LiberateCase as LiberateCase
+ , GHC.Core.Pipeline as SimplCore
+ , GHC.Core.Rules as Rules
+ , GHC.Core.Simple as CoreOpt
+ , GHC.Core.Simplifier as Simplify
+ , GHC.Core.Simplifier.Environment as SimplEnv
+ , GHC.Core.Simplifier.Monad as SimplMonad
+ , GHC.Core.Simplifier.Utils as SimplUtils
+ , GHC.Core.Specialiser as Specialise
+ , GHC.Core.Specialiser.Constructor as SpecConstr
+ , GHC.Core.StaticArgument as SAT
+ , GHC.Core.Substitution as CoreSubst
+ , GHC.Core.Tidier as CoreTidy
+ , GHC.Core.Vectoriser as Vectorise
+ , GHC.Core.Vectoriser.Builtins as Vectorise.Builtins
+ , GHC.Core.Vectoriser.Builtins.Base as Vectorise.Builtins.Base
+ , GHC.Core.Vectoriser.Builtins.Initialise as Vectorise.Builtins.Initialise
+ , GHC.Core.Vectoriser.Convert as Vectorise.Convert
+ , GHC.Core.Vectoriser.Env as Vectorise.Env
+ , GHC.Core.Vectoriser.Exp as Vectorise.Exp
+ , GHC.Core.Vectoriser.Generic.Description as Vectorise.Generic.Description
+ , GHC.Core.Vectoriser.Generic.PADict as Vectorise.Generic.PADict
+ , GHC.Core.Vectoriser.Generic.PAMethods as Vectorise.Generic.PAMethods
+ , GHC.Core.Vectoriser.Generic.PData as Vectorise.Generic.PData
+ , GHC.Core.Vectoriser.Monad as Vectorise.Monad
+ , GHC.Core.Vectoriser.Monad.Base as Vectorise.Monad.Base
+ , GHC.Core.Vectoriser.Monad.Global as Vectorise.Monad.Global
+ , GHC.Core.Vectoriser.Monad.InstEnv as Vectorise.Monad.InstEnv
+ , GHC.Core.Vectoriser.Monad.Local as Vectorise.Monad.Local
+ , GHC.Core.Vectoriser.Monad.Naming as Vectorise.Monad.Naming
+ , GHC.Core.Vectoriser.Type.Classify as Vectorise.Type.Classify
+ , GHC.Core.Vectoriser.Type.Env as Vectorise.Type.Env
+ , GHC.Core.Vectoriser.Type.TyConDecl as Vectorise.Type.TyConDecl
+ , GHC.Core.Vectoriser.Type.Type as Vectorise.Type.Type
+ , GHC.Core.Vectoriser.Utils as Vectorise.Utils
+ , GHC.Core.Vectoriser.Utils.Base as Vectorise.Utils.Base
+ , GHC.Core.Vectoriser.Utils.Closure as Vectorise.Utils.Closure
+ , GHC.Core.Vectoriser.Utils.Hoisting as Vectorise.Utils.Hoisting
+ , GHC.Core.Vectoriser.Utils.PADict as Vectorise.Utils.PADict
+ , GHC.Core.Vectoriser.Utils.Poly as Vectorise.Utils.Poly
+ , GHC.Core.Vectoriser.Var as Vectorise.Var
+ , GHC.Core.WorkerWrapper as WorkWrap
+ , GHC.Core.WorkerWrapper.Utils as WwLib
+ , GHC.Core.Utils as CoreUtils
+ , GHC.Haskell.Stats as HscStats
+ , GHC.Haskell.Deriver.BasicClasses as TcGenDeriv
+ , GHC.Haskell.Deriver.Constraints as TcDerivInfer
+ , GHC.Haskell.Deriver.Functor as TcGenFunctor
+ , GHC.Haskell.Deriver.Generic as TcGenGenerics
+ , GHC.Haskell.Deriver.Typeable as TcTypeable
+ , GHC.Haskell.Deriver.Utils as TcDerivUtils
+ , GHC.Haskell.Lexer as Lexer
+ , GHC.Haskell.Parser as Parser
+ , GHC.Haskell.Parser.HeaderInfo as HeaderInfo
+ , GHC.Haskell.Parser.Syntax as RdrHsSyn
+ , GHC.Haskell.Parser.Utils as HaddockUtils
+ , GHC.Haskell.Printer.Dump as HsDumpAst
+ , GHC.Haskell.Renamer as RnSource
+ , GHC.Haskell.Renamer.Binding as RnBinds
+ , GHC.Haskell.Renamer.Documentation as RnHsDoc
+ , GHC.Haskell.Renamer.Environment as RnEnv
+ , GHC.Haskell.Renamer.Expression as RnExpr
+ , GHC.Haskell.Renamer.Fixity as RnFixity
+ , GHC.Haskell.Renamer.ImportExport as RnNames
+ , GHC.Haskell.Renamer.Pattern as RnPat
+ , GHC.Haskell.Renamer.Splice as RnSplice
+ , GHC.Haskell.Renamer.Type as RnTypes
+ , GHC.Haskell.Renamer.Utils as RnUtils
+ , GHC.Haskell.Renamer.Utils.Unbound as RnUnbound
+ , GHC.Haskell.Syntax as HsSyn
+ , GHC.Haskell.Syntax.Annotation as ApiAnnotation
+ , GHC.Haskell.Syntax.Binding as HsBinds
+ , GHC.Haskell.Syntax.Declaration as HsDecls
+ , GHC.Haskell.Syntax.Documentation as HsDoc
+ , GHC.Haskell.Syntax.Expression as HsExpr
+ , GHC.Haskell.Syntax.Extension as HsExtension
+ , GHC.Haskell.Syntax.ImportExport as HsImpExp
+ , GHC.Haskell.Syntax.Literal as HsLit
+ , GHC.Haskell.Syntax.Pattern as HsPat
+ , GHC.Haskell.Syntax.PlaceHolder as PlaceHolder
+ , GHC.Haskell.Syntax.Type as HsTypes
+ , GHC.Haskell.TypeChecker as TcRnMonad
+ , GHC.Haskell.TypeChecker.Annotation as TcAnnotations
+ , GHC.Haskell.TypeChecker.Arrow as TcArrows
+ , GHC.Haskell.TypeChecker.Binding as TcBinds
+ , GHC.Haskell.TypeChecker.ClassDeclaration as TcClassDcl
+ , GHC.Haskell.TypeChecker.Constraint.Canonicaliser as TcCanonical
+ , GHC.Haskell.TypeChecker.Constraint.Interact as TcInteract
+ , GHC.Haskell.TypeChecker.Constraint.Simplifier as TcSimplify
+ , GHC.Haskell.TypeChecker.Constraint.Solver as TcSMonad
+ , GHC.Haskell.TypeChecker.Default as TcDefaults
+ , GHC.Haskell.TypeChecker.Deriving as TcDeriv
+ , GHC.Haskell.TypeChecker.Environment as TcEnv
+ , GHC.Haskell.TypeChecker.Error as TcErrors
+ , GHC.Haskell.TypeChecker.Evidence as TcEvidence
+ , GHC.Haskell.TypeChecker.Export as TcRnExports
+ , GHC.Haskell.TypeChecker.Expression as TcExpr
+ , GHC.Haskell.TypeChecker.FamilyInstance as FamInst
+ , GHC.Haskell.TypeChecker.Flatten as TcFlatten
+ , GHC.Haskell.TypeChecker.Foreign as TcForeign
+ , GHC.Haskell.TypeChecker.FunctionalDependency as FunDeps
+ , GHC.Haskell.TypeChecker.Instance as TcInstDcls
+ , GHC.Haskell.TypeChecker.Instantiation as Inst
+ , GHC.Haskell.TypeChecker.Matches as TcMatches
+ , GHC.Haskell.TypeChecker.Module as TcRnDriver
+ , GHC.Haskell.TypeChecker.ModuleSignature as TcBackpack
+ , GHC.Haskell.TypeChecker.MutableType as TcMType
+ , GHC.Haskell.TypeChecker.Pattern as TcPat
+ , GHC.Haskell.TypeChecker.PatternSynonym as TcPatSyn
+ , GHC.Haskell.TypeChecker.Rule as TcRules
+ , GHC.Haskell.TypeChecker.Signature as TcSigs
+ , GHC.Haskell.TypeChecker.Splice as TcSplice
+ , GHC.Haskell.TypeChecker.Syntax as TcHsSyn
+ , GHC.Haskell.TypeChecker.Type as TcType
+ , GHC.Haskell.TypeChecker.TypeAndClassDeclaration as TcTyClsDecls
+ , GHC.Haskell.TypeChecker.TypeDeclaration as TcTyDecls
+ , GHC.Haskell.TypeChecker.Types as TcRnTypes
+ , GHC.Haskell.TypeChecker.Unify as TcUnify
+ , GHC.Haskell.TypeChecker.UserType as TcHsType
+ , GHC.Haskell.TypeChecker.Validity as TcValidity
+ , GHC.Haskell.Utils as HsUtils
+ , GHC.Interface.Binary as BinIface
+ , GHC.Interface.BuildTypeAndClass as BuildTyCl
+ , GHC.Interface.Environment as IfaceEnv
+ , GHC.Interface.Loader as LoadIface
+ , GHC.Interface.Renamer as RnModIface
+ , GHC.Interface.Syntax as IfaceSyn
+ , GHC.Interface.Tidier as TidyPgm
+ , GHC.Interface.TypeChecker as TcIface
+ , GHC.Interface.Types as IfaceType
+ , GHC.Interface.Utils as MkIface
+ , GHC.Llvm.MetaData as Llvm.MetaData
+ , GHC.Llvm.Printer as Llvm.PpLlvm
+ , GHC.Llvm.Syntax as Llvm.AbsSyn
+ , GHC.Llvm.Types as Llvm.Types
+ , GHC.Stg.Lint as StgLint
+ , GHC.Stg.Stats as StgStats
+ , GHC.Stg.Syntax as StgSyn
+ , GHC.Stg.CommonSubExpr as StgCse
+ , GHC.Stg.CostCentreCollector as SCCfinal
+ , GHC.Stg.Pipeline as SimplStg
+ , GHC.Stg.Unariser as UnariseStg
+ , GHC.Stg.Utils as CgUtils
, GHC.Interactive.ClosureInspect as RtClosureInspect
, GHC.Interactive.Debugger as Debugger
, GHC.Interactive.Debugger.Utils as DebuggerUtils
@@ -425,16 +425,17 @@ library
, GHC.Plugin as GhcPlugins
, GHC.Plugin.TypeChecker as TcPluginM
, GHC.Plugin.Types as Plugins
- , GHC.Program.BackPack.Main as DriverBkp
- , GHC.Program.BackPack.Syntax as BkpSyn
- , GHC.Program.CmdLineParser as CmdLineParser
- , GHC.Program.Driver.CodeOutput as CodeOutput
- , GHC.Program.Driver.Phases as DriverPhases
- , GHC.Program.Driver.Pipeline as DriverPipeline
- , GHC.Program.Driver.Pipeline.Monad as PipelineMonad
- , GHC.Program.Main as HscMain
- , GHC.Program.Make as GhcMake
- , GHC.Program.MakeDepend as DriverMkDepend
+ , GHC.Driver.BackPack.Main as DriverBkp
+ , GHC.Driver.BackPack.Syntax as BkpSyn
+ , GHC.Driver.CmdLineParser as CmdLineParser
+ , GHC.Driver.CodeOutput as CodeOutput
+ , GHC.Driver.Finder as Finder
+ , GHC.Driver.Main as HscMain
+ , GHC.Driver.Make as GhcMake
+ , GHC.Driver.MakeDepend as DriverMkDepend
+ , GHC.Driver.Phases as DriverPhases
+ , GHC.Driver.Pipeline as DriverPipeline
+ , GHC.Driver.Pipeline.Monad as PipelineMonad
, GHC.RTS.InfoTable as CmmInfo
, GHC.RTS.Storage as SMRep
, GHC.Utils as Util
@@ -455,7 +456,6 @@ library
, GHC.Utils.Error as ErrUtils
, GHC.Utils.Exception as Exception
, GHC.Utils.FileCleanup as FileCleanup
- , GHC.Utils.Finder as Finder
, GHC.Utils.Fingerprint as Fingerprint
, GHC.Utils.Handle.BufferedWrite as BufWrite
, GHC.Utils.IO.Unsafe as FastFunctions