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/Convert.hs | |
| 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/Convert.hs')
| -rw-r--r-- | haddock-api/src/Haddock/Convert.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs index 6a0bba61..ceb6916e 100644 --- a/haddock-api/src/Haddock/Convert.hs +++ b/haddock-api/src/Haddock/Convert.hs @@ -38,10 +38,10 @@ import GHC.Tc.Utils.TcType import GHC.Core.TyCon import GHC.Core.Type import GHC.Core.TyCo.Rep -import TysPrim ( alphaTyVars ) -import TysWiredIn ( eqTyConName, listTyConName, liftedTypeKindTyConName +import GHC.Builtin.Types.Prim ( alphaTyVars ) +import GHC.Builtin.Types ( eqTyConName, listTyConName, liftedTypeKindTyConName , unitTy, promotedNilDataCon, promotedConsDataCon ) -import PrelNames ( hasKey, eqTyConKey, ipClassKey, tYPETyConKey +import GHC.Builtin.Names ( hasKey, eqTyConKey, ipClassKey, tYPETyConKey , liftedRepDataConKey ) import GHC.Types.Unique ( getUnique ) import Util ( chkAppend,dropList, filterByList, filterOut ) |