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/GhcUtils.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/GhcUtils.hs')
-rw-r--r-- | haddock-api/src/Haddock/GhcUtils.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs index 6b62f3d3..f681c1dc 100644 --- a/haddock-api/src/Haddock/GhcUtils.hs +++ b/haddock-api/src/Haddock/GhcUtils.hs @@ -40,7 +40,7 @@ import GHC.Types.Var.Set ( VarSet, emptyVarSet ) import GHC.Types.Var.Env ( TyVarEnv, extendVarEnv, elemVarEnv, emptyVarEnv ) import GHC.Core.TyCo.Rep ( Type(..) ) import GHC.Core.Type ( isRuntimeRepVar ) -import TysWiredIn( liftedRepDataConTyCon ) +import GHC.Builtin.Types( liftedRepDataConTyCon ) import GHC.Hs.Utils (CollectPass(..)) import StringBuffer ( StringBuffer ) @@ -613,7 +613,7 @@ orderedFVs vs tys = -- -- >>> import GHC.Types.Name -- >>> import TyCoRep --- >>> import TysPrim +-- >>> import GHC.Builtin.Types.Prim -- >>> import GHC.Types.Var -- >>> a = TyVarTy alphaTyVar -- >>> b = TyVarTy betaTyVar |