diff options
author | Sylvain Henry <sylvain@haskus.fr> | 2020-02-18 14:45:26 +0100 |
---|---|---|
committer | Sylvain Henry <sylvain@haskus.fr> | 2020-02-19 11:20:27 +0100 |
commit | 70c86ff53f97ed9b6a41b90c61357de2ac44d702 (patch) | |
tree | 2511004ba265a149448bc01a976aed9e2044881f /haddock-api/src/Haddock | |
parent | 40591606251693956d9729ab3a15c7244d7fc2a4 (diff) |
Modules: Driver (#13009)
Diffstat (limited to 'haddock-api/src/Haddock')
-rw-r--r-- | haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs | 2 | ||||
-rw-r--r-- | haddock-api/src/Haddock/Backends/Xhtml.hs | 2 | ||||
-rw-r--r-- | haddock-api/src/Haddock/GhcUtils.hs | 4 | ||||
-rw-r--r-- | haddock-api/src/Haddock/Interface.hs | 4 | ||||
-rw-r--r-- | haddock-api/src/Haddock/Interface/AttachInstances.hs | 2 | ||||
-rw-r--r-- | haddock-api/src/Haddock/Interface/Create.hs | 4 | ||||
-rw-r--r-- | haddock-api/src/Haddock/Interface/LexParseRn.hs | 2 | ||||
-rw-r--r-- | haddock-api/src/Haddock/Interface/ParseModuleHeader.hs | 2 | ||||
-rw-r--r-- | haddock-api/src/Haddock/InterfaceFile.hs | 4 | ||||
-rw-r--r-- | haddock-api/src/Haddock/ModuleTree.hs | 4 | ||||
-rw-r--r-- | haddock-api/src/Haddock/Options.hs | 2 | ||||
-rw-r--r-- | haddock-api/src/Haddock/Parser.hs | 2 | ||||
-rw-r--r-- | haddock-api/src/Haddock/Types.hs | 2 |
13 files changed, 18 insertions, 18 deletions
diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs b/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs index 1ae4fd62..b2e2dadd 100644 --- a/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs +++ b/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs @@ -10,7 +10,7 @@ import Data.List ( isPrefixOf, isSuffixOf ) import qualified Data.ByteString as BS import BasicTypes ( IntegralLit(..) ) -import DynFlags +import GHC.Driver.Session import ErrUtils ( emptyMessages, pprLocErrMsg ) import FastString ( mkFastString ) import Lexer ( P(..), ParseResult(..), PState(..), Token(..) diff --git a/haddock-api/src/Haddock/Backends/Xhtml.hs b/haddock-api/src/Haddock/Backends/Xhtml.hs index 9e267150..0ab35210 100644 --- a/haddock-api/src/Haddock/Backends/Xhtml.hs +++ b/haddock-api/src/Haddock/Backends/Xhtml.hs @@ -49,7 +49,7 @@ import qualified Data.Map as Map hiding ( Map ) import qualified Data.Set as Set hiding ( Set ) import Data.Ord ( comparing ) -import DynFlags (Language(..)) +import GHC.Driver.Session (Language(..)) import GHC hiding ( NoLink, moduleInfo,LexicalFixity(..) ) import Name diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs index b423d55f..588f1548 100644 --- a/haddock-api/src/Haddock/GhcUtils.hs +++ b/haddock-api/src/Haddock/GhcUtils.hs @@ -29,10 +29,10 @@ import Outputable ( Outputable, panic, showPpr ) import Name import NameSet import Module -import HscTypes +import GHC.Driver.Types import GHC import Class -import DynFlags +import GHC.Driver.Session import SrcLoc ( advanceSrcLoc ) import Var ( VarBndr(..), TyVarBinder, tyVarKind, updateTyVarKind, isInvisibleArgFlag ) diff --git a/haddock-api/src/Haddock/Interface.hs b/haddock-api/src/Haddock/Interface.hs index 998116f4..008beb14 100644 --- a/haddock-api/src/Haddock/Interface.hs +++ b/haddock-api/src/Haddock/Interface.hs @@ -52,9 +52,9 @@ import Text.Printf import Module (mkModuleSet, emptyModuleSet, unionModuleSet, ModuleSet) import Digraph -import DynFlags hiding (verbosity) +import GHC.Driver.Session hiding (verbosity) import GHC hiding (verbosity) -import HscTypes +import GHC.Driver.Types import FastString (unpackFS) import TcRnTypes (tcg_rdr_env) import Name (nameIsFromExternalPackage, nameOccName) 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 diff --git a/haddock-api/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs index 812d6a50..4890a937 100644 --- a/haddock-api/src/Haddock/InterfaceFile.hs +++ b/haddock-api/src/Haddock/InterfaceFile.hs @@ -36,8 +36,8 @@ import Binary import FastMutInt import FastString import GHC hiding (NoLink) -import GhcMonad (withSession) -import HscTypes +import GHC.Driver.Monad (withSession) +import GHC.Driver.Types import NameCache import GHC.Iface.Env import Name diff --git a/haddock-api/src/Haddock/ModuleTree.hs b/haddock-api/src/Haddock/ModuleTree.hs index cff4e8f0..6a3f0606 100644 --- a/haddock-api/src/Haddock/ModuleTree.hs +++ b/haddock-api/src/Haddock/ModuleTree.hs @@ -16,8 +16,8 @@ import Haddock.Types ( MDoc ) import GHC ( Name ) import Module ( Module, moduleNameString, moduleName, moduleUnitId, unitIdString ) -import DynFlags ( DynFlags ) -import Packages ( lookupUnit, sourcePackageIdString ) +import GHC.Driver.Session ( DynFlags ) +import GHC.Driver.Packages ( lookupUnit, sourcePackageIdString ) import qualified Control.Applicative as A diff --git a/haddock-api/src/Haddock/Options.hs b/haddock-api/src/Haddock/Options.hs index fe2bb048..69cf61f5 100644 --- a/haddock-api/src/Haddock/Options.hs +++ b/haddock-api/src/Haddock/Options.hs @@ -48,7 +48,7 @@ import FastString import GHC ( DynFlags, Module, moduleUnitId ) import Haddock.Types import Haddock.Utils -import Packages +import GHC.Driver.Packages import System.Console.GetOpt import qualified Text.ParserCombinators.ReadP as RP diff --git a/haddock-api/src/Haddock/Parser.hs b/haddock-api/src/Haddock/Parser.hs index e31ea6a8..3fb7eedd 100644 --- a/haddock-api/src/Haddock/Parser.hs +++ b/haddock-api/src/Haddock/Parser.hs @@ -16,7 +16,7 @@ module Haddock.Parser ( parseParas import qualified Documentation.Haddock.Parser as P import Documentation.Haddock.Types -import DynFlags ( DynFlags ) +import GHC.Driver.Session ( DynFlags ) import FastString ( fsLit ) import Lexer ( mkPState, unP, ParseResult(POk) ) import Parser ( parseIdentifier ) diff --git a/haddock-api/src/Haddock/Types.hs b/haddock-api/src/Haddock/Types.hs index 04b2d4fc..c8e415c1 100644 --- a/haddock-api/src/Haddock/Types.hs +++ b/haddock-api/src/Haddock/Types.hs @@ -39,7 +39,7 @@ import Documentation.Haddock.Types import BasicTypes (Fixity(..), PromotionFlag(..)) import GHC -import DynFlags (Language) +import GHC.Driver.Session (Language) import qualified GHC.LanguageExtensions as LangExt import OccName import Outputable |