diff options
author | Ben Gamari <ben@smart-cactus.org> | 2020-03-16 12:45:02 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-16 12:45:02 -0400 |
commit | 3174ad334c2c505394703ce96fcb67ace94a427c (patch) | |
tree | e9cd84e1ac8aabe0c889eed6ba29686062f5dd9c /haddock-api/src/Haddock/Interface | |
parent | fc007f3c3601398f5416f3083a4d8ca695c8d6e9 (diff) | |
parent | de9560edfcd13269dd835792ad4088f1b975a910 (diff) |
Merge pull request #1130 from hsyl20/wip/hsyl20-modules-core2
Modules: Core (#13009)
Diffstat (limited to 'haddock-api/src/Haddock/Interface')
-rw-r--r-- | haddock-api/src/Haddock/Interface/AttachInstances.hs | 10 | ||||
-rw-r--r-- | haddock-api/src/Haddock/Interface/Create.hs | 2 |
2 files changed, 6 insertions, 6 deletions
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 |