From 70c86ff53f97ed9b6a41b90c61357de2ac44d702 Mon Sep 17 00:00:00 2001 From: Sylvain Henry Date: Tue, 18 Feb 2020 14:45:26 +0100 Subject: Modules: Driver (#13009) --- haddock-api/src/Haddock/Interface/AttachInstances.hs | 2 +- haddock-api/src/Haddock/Interface/Create.hs | 4 ++-- haddock-api/src/Haddock/Interface/LexParseRn.hs | 2 +- haddock-api/src/Haddock/Interface/ParseModuleHeader.hs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'haddock-api/src/Haddock/Interface') diff --git a/haddock-api/src/Haddock/Interface/AttachInstances.hs b/haddock-api/src/Haddock/Interface/AttachInstances.hs index 35f24ee5..0e24ccb0 100644 --- a/haddock-api/src/Haddock/Interface/AttachInstances.hs +++ b/haddock-api/src/Haddock/Interface/AttachInstances.hs @@ -28,7 +28,7 @@ import qualified Data.Map as Map import qualified Data.Set as Set import Class -import DynFlags +import GHC.Driver.Session import CoreSyn (isOrphan) import ErrUtils import FamInstEnv diff --git a/haddock-api/src/Haddock/Interface/Create.hs b/haddock-api/src/Haddock/Interface/Create.hs index 73857a90..dd89c62f 100644 --- a/haddock-api/src/Haddock/Interface/Create.hs +++ b/haddock-api/src/Haddock/Interface/Create.hs @@ -45,11 +45,11 @@ import qualified Module import qualified SrcLoc import ConLike (ConLike(..)) import GHC -import HscTypes +import GHC.Driver.Types import Name import NameSet import NameEnv -import Packages ( lookupModuleInAllPackages, PackageName(..) ) +import GHC.Driver.Packages ( lookupModuleInAllPackages, PackageName(..) ) import Bag import RdrName import TcRnTypes diff --git a/haddock-api/src/Haddock/Interface/LexParseRn.hs b/haddock-api/src/Haddock/Interface/LexParseRn.hs index a996f006..7323e68e 100644 --- a/haddock-api/src/Haddock/Interface/LexParseRn.hs +++ b/haddock-api/src/Haddock/Interface/LexParseRn.hs @@ -25,7 +25,7 @@ import Control.Monad import Data.List import Data.Ord import Documentation.Haddock.Doc (metaDocConcat) -import DynFlags (languageExtensions) +import GHC.Driver.Session (languageExtensions) import qualified GHC.LanguageExtensions as LangExt import GHC import Haddock.Interface.ParseModuleHeader diff --git a/haddock-api/src/Haddock/Interface/ParseModuleHeader.hs b/haddock-api/src/Haddock/Interface/ParseModuleHeader.hs index 050901b6..4e91e321 100644 --- a/haddock-api/src/Haddock/Interface/ParseModuleHeader.hs +++ b/haddock-api/src/Haddock/Interface/ParseModuleHeader.hs @@ -13,7 +13,7 @@ module Haddock.Interface.ParseModuleHeader (parseModuleHeader) where import Control.Monad (mplus) import Data.Char -import DynFlags +import GHC.Driver.Session import Haddock.Parser import Haddock.Types import RdrName -- cgit v1.2.3