From 163da78031d7959e5e00c35ade1573bf373f71bc Mon Sep 17 00:00:00 2001 From: Sylvain Henry Date: Thu, 19 Mar 2020 12:26:37 +0100 Subject: Modules: type checker --- haddock-api/src/Haddock/Convert.hs | 4 ++-- haddock-api/src/Haddock/Interface.hs | 2 +- haddock-api/src/Haddock/Interface/Create.hs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'haddock-api/src/Haddock') diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs index ac6858c4..a130a6be 100644 --- a/haddock-api/src/Haddock/Convert.hs +++ b/haddock-api/src/Haddock/Convert.hs @@ -34,7 +34,7 @@ import GHC.Types.Name.Set ( emptyNameSet ) import GHC.Types.Name.Reader ( mkVarUnqual ) import GHC.Core.PatSyn import GHC.Types.SrcLoc ( Located, noLoc, unLoc, GenLocated(..), srcLocSpan ) -import TcType +import GHC.Tc.Utils.Type import GHC.Core.TyCon import GHC.Core.Type import GHC.Core.TyCo.Rep @@ -800,7 +800,7 @@ synifyFamInst fi opaque = do eta_expanded_lhs -- eta-expand lhs types, because sometimes data/newtype -- instances are eta-reduced; See Trac #9692 - -- See Note [Eta reduction for data family axioms] in TcInstDcls in GHC + -- See Note [Eta reduction for data family axioms] in GHC.Tc.TyCl.Instance in GHC | DataFamilyInst rep_tc <- fam_flavor = let (_, rep_tc_args) = splitTyConApp fam_rhs etad_tyvars = dropList rep_tc_args $ tyConTyVars rep_tc diff --git a/haddock-api/src/Haddock/Interface.hs b/haddock-api/src/Haddock/Interface.hs index ef94cf5c..7d20638d 100644 --- a/haddock-api/src/Haddock/Interface.hs +++ b/haddock-api/src/Haddock/Interface.hs @@ -56,7 +56,7 @@ import GHC.Driver.Session hiding (verbosity) import GHC hiding (verbosity) import GHC.Driver.Types import FastString (unpackFS) -import TcRnTypes (tcg_rdr_env) +import GHC.Tc.Utils (tcg_rdr_env) import GHC.Types.Name (nameIsFromExternalPackage, nameOccName) import GHC.Types.Name.Occurrence (isTcOcc) import GHC.Types.Name.Reader (unQualOK, gre_name, globalRdrEnvElts) diff --git a/haddock-api/src/Haddock/Interface/Create.hs b/haddock-api/src/Haddock/Interface/Create.hs index 8227a6a3..43f12d3d 100644 --- a/haddock-api/src/Haddock/Interface/Create.hs +++ b/haddock-api/src/Haddock/Interface/Create.hs @@ -52,7 +52,7 @@ import GHC.Types.Name.Env import GHC.Driver.Packages ( lookupModuleInAllPackages, PackageName(..) ) import Bag import GHC.Types.Name.Reader -import TcRnTypes +import GHC.Tc.Utils import FastString ( unpackFS, bytesFS ) import GHC.Types.Basic ( StringLiteral(..), SourceText(..), PromotionFlag(..) ) import qualified Outputable as O -- cgit v1.2.3