diff options
| author | Cale Gibbard <cgibbard@gmail.com> | 2020-04-20 11:30:38 -0400 |
|---|---|---|
| committer | Cale Gibbard <cgibbard@gmail.com> | 2020-04-20 11:30:38 -0400 |
| commit | ff5c04e3142cebfb51873e2c6164703d3b7f74cc (patch) | |
| tree | da9825b15419755e67c2eda5b6f929fc5b6b56d5 /haddock-api/src/Haddock/Interface | |
| parent | b6bebdce0f217af8b6a249b3b6c2bd32dfa2b0b0 (diff) | |
| parent | 75ea1b31fce54bf2b0c1bf8edad4419f48e6036c (diff) | |
Merge remote-tracking branch 'origin/ghc-head' into wip/ttg-con-pat
Diffstat (limited to 'haddock-api/src/Haddock/Interface')
| -rw-r--r-- | haddock-api/src/Haddock/Interface/AttachInstances.hs | 2 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Interface/Rename.hs | 2 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Interface/Specialize.hs | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/haddock-api/src/Haddock/Interface/AttachInstances.hs b/haddock-api/src/Haddock/Interface/AttachInstances.hs index 5bec4d34..00e9aabb 100644 --- a/haddock-api/src/Haddock/Interface/AttachInstances.hs +++ b/haddock-api/src/Haddock/Interface/AttachInstances.hs @@ -42,7 +42,7 @@ import Outputable (text, sep, (<+>)) import GHC.Types.SrcLoc import GHC.Core.TyCon import GHC.Core.TyCo.Rep -import TysPrim( funTyConName ) +import GHC.Builtin.Types.Prim( funTyConName ) import GHC.Types.Var hiding (varName) type ExportedNames = Set.Set Name diff --git a/haddock-api/src/Haddock/Interface/Rename.hs b/haddock-api/src/Haddock/Interface/Rename.hs index a4dda417..4ca4a13d 100644 --- a/haddock-api/src/Haddock/Interface/Rename.hs +++ b/haddock-api/src/Haddock/Interface/Rename.hs @@ -24,7 +24,7 @@ import GHC hiding (NoLink) import GHC.Types.Name import Outputable ( panic ) import GHC.Types.Name.Reader (RdrName(Exact)) -import TysWiredIn (eqTyCon_RDR) +import GHC.Builtin.Types (eqTyCon_RDR) import Control.Applicative import Control.Arrow ( first ) diff --git a/haddock-api/src/Haddock/Interface/Specialize.hs b/haddock-api/src/Haddock/Interface/Specialize.hs index d79b61d9..52cbcdbf 100644 --- a/haddock-api/src/Haddock/Interface/Specialize.hs +++ b/haddock-api/src/Haddock/Interface/Specialize.hs @@ -15,8 +15,8 @@ import Haddock.Types import GHC import GHC.Types.Name import FastString -import TysPrim ( funTyConName ) -import TysWiredIn ( listTyConName ) +import GHC.Builtin.Types.Prim ( funTyConName ) +import GHC.Builtin.Types ( listTyConName ) import Control.Monad import Control.Monad.Trans.State |