aboutsummaryrefslogtreecommitdiff
path: root/haddock-api/src
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2020-03-16 12:45:02 -0400
committerGitHub <noreply@github.com>2020-03-16 12:45:02 -0400
commit3174ad334c2c505394703ce96fcb67ace94a427c (patch)
treee9cd84e1ac8aabe0c889eed6ba29686062f5dd9c /haddock-api/src
parentfc007f3c3601398f5416f3083a4d8ca695c8d6e9 (diff)
parentde9560edfcd13269dd835792ad4088f1b975a910 (diff)
Merge pull request #1130 from hsyl20/wip/hsyl20-modules-core2
Modules: Core (#13009)
Diffstat (limited to 'haddock-api/src')
-rw-r--r--haddock-api/src/Haddock/Backends/Hoogle.hs2
-rw-r--r--haddock-api/src/Haddock/Convert.hs18
-rw-r--r--haddock-api/src/Haddock/GhcUtils.hs6
-rw-r--r--haddock-api/src/Haddock/Interface/AttachInstances.hs10
-rw-r--r--haddock-api/src/Haddock/Interface/Create.hs2
5 files changed, 19 insertions, 19 deletions
diff --git a/haddock-api/src/Haddock/Backends/Hoogle.hs b/haddock-api/src/Haddock/Backends/Hoogle.hs
index b76d14b5..c127235c 100644
--- a/haddock-api/src/Haddock/Backends/Hoogle.hs
+++ b/haddock-api/src/Haddock/Backends/Hoogle.hs
@@ -19,7 +19,7 @@ module Haddock.Backends.Hoogle (
import BasicTypes ( OverlapFlag(..), OverlapMode(..), SourceText(..)
, PromotionFlag(..), TopLevelFlag(..) )
-import InstEnv (ClsInst(..))
+import GHC.Core.InstEnv (ClsInst(..))
import Documentation.Haddock.Markup
import Haddock.GhcUtils
import Haddock.Types hiding (Version)
diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs
index 42175254..011ead00 100644
--- a/haddock-api/src/Haddock/Convert.hs
+++ b/haddock-api/src/Haddock/Convert.hs
@@ -22,22 +22,22 @@ module Haddock.Convert (
import Bag ( emptyBag )
import BasicTypes ( TupleSort(..), SourceText(..), LexicalFixity(..)
, PromotionFlag(..), DefMethSpec(..) )
-import Class
-import CoAxiom
-import ConLike
+import GHC.Core.Class
+import GHC.Core.Coercion.Axiom
+import GHC.Core.ConLike
import Data.Either (lefts, rights)
-import DataCon
-import FamInstEnv
+import GHC.Core.DataCon
+import GHC.Core.FamInstEnv
import GHC.Hs
import Name
import NameSet ( emptyNameSet )
import RdrName ( mkVarUnqual )
-import PatSyn
+import GHC.Core.PatSyn
import SrcLoc ( Located, noLoc, unLoc, GenLocated(..), srcLocSpan )
import TcType
-import TyCon
-import Type
-import TyCoRep
+import GHC.Core.TyCon
+import GHC.Core.Type
+import GHC.Core.TyCo.Rep
import TysPrim ( alphaTyVars )
import TysWiredIn ( eqTyConName, listTyConName, liftedTypeKindTyConName
, unitTy, promotedNilDataCon, promotedConsDataCon )
diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs
index 588f1548..75e3fa45 100644
--- a/haddock-api/src/Haddock/GhcUtils.hs
+++ b/haddock-api/src/Haddock/GhcUtils.hs
@@ -31,15 +31,15 @@ import NameSet
import Module
import GHC.Driver.Types
import GHC
-import Class
+import GHC.Core.Class
import GHC.Driver.Session
import SrcLoc ( advanceSrcLoc )
import Var ( VarBndr(..), TyVarBinder, tyVarKind, updateTyVarKind,
isInvisibleArgFlag )
import VarSet ( VarSet, emptyVarSet )
import VarEnv ( TyVarEnv, extendVarEnv, elemVarEnv, emptyVarEnv )
-import TyCoRep ( Type(..) )
-import Type ( isRuntimeRepVar )
+import GHC.Core.TyCo.Rep ( Type(..) )
+import GHC.Core.Type ( isRuntimeRepVar )
import TysWiredIn( liftedRepDataConTyCon )
import StringBuffer ( StringBuffer )
diff --git a/haddock-api/src/Haddock/Interface/AttachInstances.hs b/haddock-api/src/Haddock/Interface/AttachInstances.hs
index c6892edd..65deffd3 100644
--- a/haddock-api/src/Haddock/Interface/AttachInstances.hs
+++ b/haddock-api/src/Haddock/Interface/AttachInstances.hs
@@ -27,21 +27,21 @@ import Data.Maybe ( maybeToList, mapMaybe, fromMaybe )
import qualified Data.Map as Map
import qualified Data.Set as Set
-import Class
+import GHC.Core.Class
import GHC.Driver.Session
import GHC.Core (isOrphan)
import ErrUtils
-import FamInstEnv
+import GHC.Core.FamInstEnv
import GHC
-import InstEnv
+import GHC.Core.InstEnv
import Module ( ModuleSet, moduleSetElts )
import MonadUtils (liftIO)
import Name
import NameEnv
import Outputable (text, sep, (<+>))
import SrcLoc
-import TyCon
-import TyCoRep
+import GHC.Core.TyCon
+import GHC.Core.TyCo.Rep
import TysPrim( funTyConName )
import Var hiding (varName)
diff --git a/haddock-api/src/Haddock/Interface/Create.hs b/haddock-api/src/Haddock/Interface/Create.hs
index 5f21e36f..a606076d 100644
--- a/haddock-api/src/Haddock/Interface/Create.hs
+++ b/haddock-api/src/Haddock/Interface/Create.hs
@@ -43,7 +43,7 @@ import Avail hiding (avail)
import qualified Avail
import qualified Module
import qualified SrcLoc
-import ConLike (ConLike(..))
+import GHC.Core.ConLike (ConLike(..))
import GHC
import GHC.Driver.Types
import Name