diff options
Diffstat (limited to 'testsuite/tests')
54 files changed, 75 insertions, 75 deletions
diff --git a/testsuite/tests/annotations/should_run/annrun01.hs b/testsuite/tests/annotations/should_run/annrun01.hs index f8c0ca5e84..fd2c7bc415 100644 --- a/testsuite/tests/annotations/should_run/annrun01.hs +++ b/testsuite/tests/annotations/should_run/annrun01.hs @@ -5,7 +5,7 @@ module Main where import GHC import MonadUtils ( liftIO ) import Data.Maybe -import DynFlags ( defaultFatalMessager, defaultFlushOut ) +import GHC.Driver.Session ( defaultFatalMessager, defaultFlushOut ) import Annotations ( AnnTarget(..), CoreAnnTarget ) import GHC.Serialized ( deserializeWithData ) import Panic diff --git a/testsuite/tests/callarity/unittest/CallArity1.hs b/testsuite/tests/callarity/unittest/CallArity1.hs index 3b74aeaa7e..8a1cacc4e0 100644 --- a/testsuite/tests/callarity/unittest/CallArity1.hs +++ b/testsuite/tests/callarity/unittest/CallArity1.hs @@ -7,7 +7,7 @@ import MkCore import CallArity (callArityRHS) import MkId import SysTools -import DynFlags +import GHC.Driver.Session import ErrUtils import Outputable import TysWiredIn diff --git a/testsuite/tests/codeGen/should_run/T13825-unit.hs b/testsuite/tests/codeGen/should_run/T13825-unit.hs index 1c8d6e2155..5861435d9b 100644 --- a/testsuite/tests/codeGen/should_run/T13825-unit.hs +++ b/testsuite/tests/codeGen/should_run/T13825-unit.hs @@ -1,12 +1,12 @@ module Main where -import DynFlags +import GHC.Driver.Session import GHC.Types.RepType import GHC.Runtime.Heap.Layout import GHC.StgToCmm.Layout import GHC.StgToCmm.Closure import GHC -import GhcMonad +import GHC.Driver.Monad import System.Environment import GHC.Platform diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs index 5187a7bf74..9ed13ed3be 100644 --- a/testsuite/tests/driver/T4437.hs +++ b/testsuite/tests/driver/T4437.hs @@ -8,7 +8,7 @@ module Main (main) where import Control.Monad import Data.List ( (\\) ) -import DynFlags +import GHC.Driver.Session import Language.Haskell.Extension main :: IO () diff --git a/testsuite/tests/ghc-api/T10508_api.hs b/testsuite/tests/ghc-api/T10508_api.hs index d0b8b0a946..f2f5574222 100644 --- a/testsuite/tests/ghc-api/T10508_api.hs +++ b/testsuite/tests/ghc-api/T10508_api.hs @@ -1,6 +1,6 @@ module Main where -import DynFlags +import GHC.Driver.Session import GHC import qualified GHC.LanguageExtensions as LangExt diff --git a/testsuite/tests/ghc-api/T10942.hs b/testsuite/tests/ghc-api/T10942.hs index 6fbf1d5bd3..53528ad718 100644 --- a/testsuite/tests/ghc-api/T10942.hs +++ b/testsuite/tests/ghc-api/T10942.hs @@ -1,6 +1,6 @@ module Main where -import DynFlags +import GHC.Driver.Session import GHC import Control.Monad.IO.Class (liftIO) diff --git a/testsuite/tests/ghc-api/T11579.hs b/testsuite/tests/ghc-api/T11579.hs index 3294f999f2..493823b843 100644 --- a/testsuite/tests/ghc-api/T11579.hs +++ b/testsuite/tests/ghc-api/T11579.hs @@ -1,5 +1,5 @@ import System.Environment -import DynFlags +import GHC.Driver.Session import FastString import GHC import StringBuffer diff --git a/testsuite/tests/ghc-api/T12099.hs b/testsuite/tests/ghc-api/T12099.hs index ba254cfd13..e9fe77d6e2 100644 --- a/testsuite/tests/ghc-api/T12099.hs +++ b/testsuite/tests/ghc-api/T12099.hs @@ -1,6 +1,6 @@ module Main where -import DynFlags +import GHC.Driver.Session import Control.Monad import Data.List (isPrefixOf) diff --git a/testsuite/tests/ghc-api/T4891/T4891.hs b/testsuite/tests/ghc-api/T4891/T4891.hs index feb792862b..58e40b5e85 100644 --- a/testsuite/tests/ghc-api/T4891/T4891.hs +++ b/testsuite/tests/ghc-api/T4891/T4891.hs @@ -7,7 +7,7 @@ import Data.Array import DataCon import GHC import GHC.Exts.Heap -import HscTypes +import GHC.Driver.Types import GHC.Runtime.Linker import GHC.Runtime.Heap.Inspect import TcEnv @@ -21,7 +21,7 @@ import Control.Monad import Data.Maybe import Bag import Outputable -import GhcMonad +import GHC.Driver.Monad import X import System.Environment diff --git a/testsuite/tests/ghc-api/T7478/T7478.hs b/testsuite/tests/ghc-api/T7478/T7478.hs index bd6fb37d8b..4aa6f7d29e 100644 --- a/testsuite/tests/ghc-api/T7478/T7478.hs +++ b/testsuite/tests/ghc-api/T7478/T7478.hs @@ -8,7 +8,7 @@ import System.Environment import GHC import qualified Config as GHC import qualified Outputable as GHC -import GhcMonad (liftIO) +import GHC.Driver.Monad (liftIO) import Outputable (PprStyle, queryQual) compileInGhc :: [FilePath] -- ^ Targets diff --git a/testsuite/tests/ghc-api/T8628.hs b/testsuite/tests/ghc-api/T8628.hs index d3b05a9f86..983adf8636 100644 --- a/testsuite/tests/ghc-api/T8628.hs +++ b/testsuite/tests/ghc-api/T8628.hs @@ -1,7 +1,7 @@ module Main where import System.IO -import DynFlags +import GHC.Driver.Session import GHC import Exception import Module diff --git a/testsuite/tests/ghc-api/T8639_api.hs b/testsuite/tests/ghc-api/T8639_api.hs index 2b0bc7d4c6..eab7ff9146 100644 --- a/testsuite/tests/ghc-api/T8639_api.hs +++ b/testsuite/tests/ghc-api/T8639_api.hs @@ -1,7 +1,7 @@ module Main where import GHC -import GhcMonad +import GHC.Driver.Monad import Outputable import System.IO import System.Environment( getArgs ) diff --git a/testsuite/tests/ghc-api/T9015.hs b/testsuite/tests/ghc-api/T9015.hs index 977390b88e..228449041d 100644 --- a/testsuite/tests/ghc-api/T9015.hs +++ b/testsuite/tests/ghc-api/T9015.hs @@ -1,9 +1,9 @@ module Main where import GHC -import DynFlags +import GHC.Driver.Session import System.Environment -import GhcMonad +import GHC.Driver.Monad testStrings = [ "import Data.Maybe" diff --git a/testsuite/tests/ghc-api/T9595.hs b/testsuite/tests/ghc-api/T9595.hs index 0f71d7700b..a4c3dea7e4 100644 --- a/testsuite/tests/ghc-api/T9595.hs +++ b/testsuite/tests/ghc-api/T9595.hs @@ -1,11 +1,11 @@ module Main where import GHC -import Packages -import GhcMonad +import GHC.Driver.Packages +import GHC.Driver.Monad import Outputable import System.Environment -import DynFlags +import GHC.Driver.Session import Module main = diff --git a/testsuite/tests/ghc-api/annotations-literals/literals.hs b/testsuite/tests/ghc-api/annotations-literals/literals.hs index 9243eba0b7..c125ea6e43 100644 --- a/testsuite/tests/ghc-api/annotations-literals/literals.hs +++ b/testsuite/tests/ghc-api/annotations-literals/literals.hs @@ -7,7 +7,7 @@ import Data.Data import Data.List (intercalate) import System.IO import GHC -import DynFlags +import GHC.Driver.Session import MonadUtils import Outputable import Bag (filterBag,isEmptyBag) diff --git a/testsuite/tests/ghc-api/annotations-literals/parsed.hs b/testsuite/tests/ghc-api/annotations-literals/parsed.hs index cba17fe4c3..352aae6e17 100644 --- a/testsuite/tests/ghc-api/annotations-literals/parsed.hs +++ b/testsuite/tests/ghc-api/annotations-literals/parsed.hs @@ -8,7 +8,7 @@ import Data.Data import Data.List (intercalate) import System.IO import GHC -import DynFlags +import GHC.Driver.Session import MonadUtils import Outputable import Bag (filterBag,isEmptyBag) diff --git a/testsuite/tests/ghc-api/annotations/CheckUtils.hs b/testsuite/tests/ghc-api/annotations/CheckUtils.hs index cdcec69029..a43348bcda 100644 --- a/testsuite/tests/ghc-api/annotations/CheckUtils.hs +++ b/testsuite/tests/ghc-api/annotations/CheckUtils.hs @@ -9,7 +9,7 @@ import Data.List import System.IO import GHC import BasicTypes -import DynFlags +import GHC.Driver.Session import MonadUtils import Outputable import ApiAnnotation diff --git a/testsuite/tests/ghc-api/annotations/annotations.hs b/testsuite/tests/ghc-api/annotations/annotations.hs index a9d54a422b..d9157511aa 100644 --- a/testsuite/tests/ghc-api/annotations/annotations.hs +++ b/testsuite/tests/ghc-api/annotations/annotations.hs @@ -9,7 +9,7 @@ import Data.Data import Data.List (intercalate) import System.IO import GHC -import DynFlags +import GHC.Driver.Session import MonadUtils import Outputable import Bag (filterBag,isEmptyBag) diff --git a/testsuite/tests/ghc-api/annotations/comments.hs b/testsuite/tests/ghc-api/annotations/comments.hs index 128a69f15e..8a36043e55 100644 --- a/testsuite/tests/ghc-api/annotations/comments.hs +++ b/testsuite/tests/ghc-api/annotations/comments.hs @@ -9,7 +9,7 @@ import Data.Data import Data.List (intercalate) import System.IO import GHC -import DynFlags +import GHC.Driver.Session import MonadUtils import Outputable import Bag (filterBag,isEmptyBag) diff --git a/testsuite/tests/ghc-api/annotations/listcomps.hs b/testsuite/tests/ghc-api/annotations/listcomps.hs index 313da7c750..8af3bf6b69 100644 --- a/testsuite/tests/ghc-api/annotations/listcomps.hs +++ b/testsuite/tests/ghc-api/annotations/listcomps.hs @@ -10,7 +10,7 @@ import Data.List (intercalate) import System.IO import GHC import BasicTypes -import DynFlags +import GHC.Driver.Session import MonadUtils import Outputable import ApiAnnotation diff --git a/testsuite/tests/ghc-api/annotations/parseTree.hs b/testsuite/tests/ghc-api/annotations/parseTree.hs index 453cade21d..be72c7f195 100644 --- a/testsuite/tests/ghc-api/annotations/parseTree.hs +++ b/testsuite/tests/ghc-api/annotations/parseTree.hs @@ -10,7 +10,7 @@ import Data.List (intercalate) import System.IO import GHC import BasicTypes -import DynFlags +import GHC.Driver.Session import MonadUtils import Outputable import Bag (filterBag,isEmptyBag) diff --git a/testsuite/tests/ghc-api/annotations/stringSource.hs b/testsuite/tests/ghc-api/annotations/stringSource.hs index 9c5d114211..698d93a6e2 100644 --- a/testsuite/tests/ghc-api/annotations/stringSource.hs +++ b/testsuite/tests/ghc-api/annotations/stringSource.hs @@ -12,7 +12,7 @@ import Data.List (intercalate) import System.IO import GHC import BasicTypes -import DynFlags +import GHC.Driver.Session import FastString import ForeignCall import MonadUtils diff --git a/testsuite/tests/ghc-api/annotations/t11430.hs b/testsuite/tests/ghc-api/annotations/t11430.hs index 81c070c01c..f1022805cf 100644 --- a/testsuite/tests/ghc-api/annotations/t11430.hs +++ b/testsuite/tests/ghc-api/annotations/t11430.hs @@ -12,7 +12,7 @@ import Data.List (intercalate) import System.IO import GHC import BasicTypes -import DynFlags +import GHC.Driver.Session import FastString import ForeignCall import MonadUtils diff --git a/testsuite/tests/ghc-api/apirecomp001/myghc.hs b/testsuite/tests/ghc-api/apirecomp001/myghc.hs index 799382cac8..fba7dd3d48 100644 --- a/testsuite/tests/ghc-api/apirecomp001/myghc.hs +++ b/testsuite/tests/ghc-api/apirecomp001/myghc.hs @@ -10,7 +10,7 @@ module Main where import GHC -import DynFlags +import GHC.Driver.Session import MonadUtils ( MonadIO(..) ) import BasicTypes ( failed ) import Bag ( bagToList ) diff --git a/testsuite/tests/ghc-api/downsweep/OldModLocation.hs b/testsuite/tests/ghc-api/downsweep/OldModLocation.hs index 96bd4deb58..d3aeddd0bc 100644 --- a/testsuite/tests/ghc-api/downsweep/OldModLocation.hs +++ b/testsuite/tests/ghc-api/downsweep/OldModLocation.hs @@ -1,9 +1,9 @@ {-# LANGUAGE ViewPatterns #-} import GHC -import GhcMake -import DynFlags -import Finder +import GHC.Driver.Make +import GHC.Driver.Session +import GHC.Driver.Finder import Control.Monad.IO.Class (liftIO) import Data.List (sort, stripPrefix) diff --git a/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs b/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs index 86e6b9d650..df6a2b63f6 100644 --- a/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs +++ b/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs @@ -4,8 +4,8 @@ -- kinds of parse errors occur in modules. import GHC -import GhcMake -import DynFlags +import GHC.Driver.Make +import GHC.Driver.Session import Outputable import Exception (ExceptionMonad, ghandle) import Bag diff --git a/testsuite/tests/ghc-api/target-contents/TargetContents.hs b/testsuite/tests/ghc-api/target-contents/TargetContents.hs index 33e73e8991..04d97c108a 100644 --- a/testsuite/tests/ghc-api/target-contents/TargetContents.hs +++ b/testsuite/tests/ghc-api/target-contents/TargetContents.hs @@ -2,7 +2,7 @@ module Main where -import DynFlags +import GHC.Driver.Session import GHC import Control.Monad @@ -13,7 +13,7 @@ import Data.Time.Calendar import Data.Time.Clock import Exception import HeaderInfo -import HscTypes +import GHC.Driver.Types import Outputable import StringBuffer import System.Directory diff --git a/testsuite/tests/ghci/should_run/tc-plugin-ghci/TcPluginGHCi.hs b/testsuite/tests/ghci/should_run/tc-plugin-ghci/TcPluginGHCi.hs index c8a3bb6d34..9d0ed01491 100644 --- a/testsuite/tests/ghci/should_run/tc-plugin-ghci/TcPluginGHCi.hs +++ b/testsuite/tests/ghci/should_run/tc-plugin-ghci/TcPluginGHCi.hs @@ -1,7 +1,7 @@ module TcPluginGHCi where import TcRnMonad ( TcPlugin(..), TcPluginResult(..) ) -import Plugins ( defaultPlugin, Plugin(..), CommandLineOption ) +import GHC.Driver.Plugins ( defaultPlugin, Plugin(..), CommandLineOption ) import Debug.Trace plugin :: Plugin diff --git a/testsuite/tests/hiefile/should_run/PatTypes.hs b/testsuite/tests/hiefile/should_run/PatTypes.hs index 352b8f1070..5d67639339 100644 --- a/testsuite/tests/hiefile/should_run/PatTypes.hs +++ b/testsuite/tests/hiefile/should_run/PatTypes.hs @@ -12,7 +12,7 @@ import GHC.Iface.Ext.Binary import GHC.Iface.Ext.Types import GHC.Iface.Ext.Utils -import DynFlags +import GHC.Driver.Session import SysTools import qualified Data.Map as M diff --git a/testsuite/tests/parser/should_run/CountParserDeps.hs b/testsuite/tests/parser/should_run/CountParserDeps.hs index f3dc6e6154..0fedc62dca 100644 --- a/testsuite/tests/parser/should_run/CountParserDeps.hs +++ b/testsuite/tests/parser/should_run/CountParserDeps.hs @@ -10,10 +10,10 @@ module Main(main) where -- provided with as small a number of modules as possible for when the -- need exists to produce ASTs and nothing more. -import HscTypes +import GHC.Driver.Types import Module -import DynFlags -import HscMain +import GHC.Driver.Session +import GHC.Driver.Main import GHC import Util import Data.Maybe diff --git a/testsuite/tests/plugins/FrontendPlugin.hs b/testsuite/tests/plugins/FrontendPlugin.hs index 8a223beae9..e264cc4062 100644 --- a/testsuite/tests/plugins/FrontendPlugin.hs +++ b/testsuite/tests/plugins/FrontendPlugin.hs @@ -1,11 +1,11 @@ module FrontendPlugin where -import GhcPlugins +import GHC.Plugins import qualified GHC import GHC ( Ghc, LoadHowMuch(..) ) -import DriverPipeline hiding ( hsc_env ) -import DriverPhases +import GHC.Driver.Pipeline hiding ( hsc_env ) +import GHC.Driver.Phases import System.Exit import Control.Monad import Data.List (partition) diff --git a/testsuite/tests/plugins/HomePackagePlugin.hs b/testsuite/tests/plugins/HomePackagePlugin.hs index 7c979c3fb5..d2b11dd81a 100644 --- a/testsuite/tests/plugins/HomePackagePlugin.hs +++ b/testsuite/tests/plugins/HomePackagePlugin.hs @@ -1,6 +1,6 @@ module HomePackagePlugin where -import GhcPlugins +import GHC.Plugins plugin :: Plugin plugin = defaultPlugin { diff --git a/testsuite/tests/plugins/LinkerTicklingPlugin.hs b/testsuite/tests/plugins/LinkerTicklingPlugin.hs index 260d4c1228..7b7fc12a62 100644 --- a/testsuite/tests/plugins/LinkerTicklingPlugin.hs +++ b/testsuite/tests/plugins/LinkerTicklingPlugin.hs @@ -1,7 +1,7 @@ module LinkerTicklingPlugin where -import GhcPlugins -import DynFlags +import GHC.Plugins +import GHC.Driver.Session plugin :: Plugin plugin = defaultPlugin { diff --git a/testsuite/tests/plugins/T16104-plugin/T16104_Plugin.hs b/testsuite/tests/plugins/T16104-plugin/T16104_Plugin.hs index 79cd0fe16d..c85b4ca395 100644 --- a/testsuite/tests/plugins/T16104-plugin/T16104_Plugin.hs +++ b/testsuite/tests/plugins/T16104-plugin/T16104_Plugin.hs @@ -2,7 +2,7 @@ module T16104_Plugin (plugin) where -import GhcPlugins +import GHC.Plugins import Data.Bits plugin :: Plugin diff --git a/testsuite/tests/plugins/annotation-plugin/SayAnnNames.hs b/testsuite/tests/plugins/annotation-plugin/SayAnnNames.hs index ae4135d203..1db2693c6b 100644 --- a/testsuite/tests/plugins/annotation-plugin/SayAnnNames.hs +++ b/testsuite/tests/plugins/annotation-plugin/SayAnnNames.hs @@ -1,6 +1,6 @@ {-# LANGUAGE DeriveDataTypeable #-} module SayAnnNames (plugin, SomeAnn(..)) where -import GhcPlugins +import GHC.Plugins import Control.Monad (unless) import Data.Data diff --git a/testsuite/tests/plugins/hole-fit-plugin/HoleFitPlugin.hs b/testsuite/tests/plugins/hole-fit-plugin/HoleFitPlugin.hs index 2692dbe665..054df8af3c 100644 --- a/testsuite/tests/plugins/hole-fit-plugin/HoleFitPlugin.hs +++ b/testsuite/tests/plugins/hole-fit-plugin/HoleFitPlugin.hs @@ -1,7 +1,7 @@ {-# LANGUAGE TypeApplications, RecordWildCards #-} module HoleFitPlugin where -import GhcPlugins hiding ((<>)) +import GHC.Plugins hiding ((<>)) import TcHoleErrors diff --git a/testsuite/tests/plugins/hooks-plugin/Hooks/Plugin.hs b/testsuite/tests/plugins/hooks-plugin/Hooks/Plugin.hs index 04e066c22f..ab3a1e26e3 100644 --- a/testsuite/tests/plugins/hooks-plugin/Hooks/Plugin.hs +++ b/testsuite/tests/plugins/hooks-plugin/Hooks/Plugin.hs @@ -2,11 +2,11 @@ module Hooks.Plugin (plugin) where import BasicTypes -import GhcPlugins +import GHC.Plugins import GHC.Hs.Expr import GHC.Hs.Extension import GHC.Hs.Lit -import Hooks +import GHC.Driver.Hooks import TcRnMonad plugin :: Plugin diff --git a/testsuite/tests/plugins/plugin-recomp/Common.hs b/testsuite/tests/plugins/plugin-recomp/Common.hs index ce4f8240c8..0ba2b36202 100644 --- a/testsuite/tests/plugins/plugin-recomp/Common.hs +++ b/testsuite/tests/plugins/plugin-recomp/Common.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} module Common where -import GhcPlugins +import GHC.Plugins install :: [CommandLineOption] -> [CoreToDo] -> CoreM [CoreToDo] install options todos = do diff --git a/testsuite/tests/plugins/plugin-recomp/FingerprintPlugin.hs b/testsuite/tests/plugins/plugin-recomp/FingerprintPlugin.hs index 584962470a..41c0de44f1 100644 --- a/testsuite/tests/plugins/plugin-recomp/FingerprintPlugin.hs +++ b/testsuite/tests/plugins/plugin-recomp/FingerprintPlugin.hs @@ -1,6 +1,6 @@ module FingerprintPlugin where -import GhcPlugins +import GHC.Plugins import Common plugin :: Plugin diff --git a/testsuite/tests/plugins/plugin-recomp/ImpurePlugin.hs b/testsuite/tests/plugins/plugin-recomp/ImpurePlugin.hs index 0ccb626a15..2a123e561f 100644 --- a/testsuite/tests/plugins/plugin-recomp/ImpurePlugin.hs +++ b/testsuite/tests/plugins/plugin-recomp/ImpurePlugin.hs @@ -1,6 +1,6 @@ module ImpurePlugin where -import GhcPlugins +import GHC.Plugins import Common plugin :: Plugin diff --git a/testsuite/tests/plugins/plugin-recomp/PurePlugin.hs b/testsuite/tests/plugins/plugin-recomp/PurePlugin.hs index c106aa3400..acc319531c 100644 --- a/testsuite/tests/plugins/plugin-recomp/PurePlugin.hs +++ b/testsuite/tests/plugins/plugin-recomp/PurePlugin.hs @@ -1,6 +1,6 @@ module PurePlugin where -import GhcPlugins +import GHC.Plugins import Common plugin :: Plugin diff --git a/testsuite/tests/plugins/rule-defining-plugin/RuleDefiningPlugin.hs b/testsuite/tests/plugins/rule-defining-plugin/RuleDefiningPlugin.hs index ad6657129c..5552ae0194 100644 --- a/testsuite/tests/plugins/rule-defining-plugin/RuleDefiningPlugin.hs +++ b/testsuite/tests/plugins/rule-defining-plugin/RuleDefiningPlugin.hs @@ -1,6 +1,6 @@ module RuleDefiningPlugin where -import GhcPlugins +import GHC.Plugins {-# RULES "unsound" forall x. show x = "SHOWED" #-} diff --git a/testsuite/tests/plugins/simple-plugin/Simple/Plugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/Plugin.hs index aabc1e5b6c..91ecb6d44b 100644 --- a/testsuite/tests/plugins/simple-plugin/Simple/Plugin.hs +++ b/testsuite/tests/plugins/simple-plugin/Simple/Plugin.hs @@ -3,7 +3,7 @@ module Simple.Plugin(plugin) where import UniqFM -import GhcPlugins +import GHC.Plugins import qualified ErrUtils -- For annotation tests diff --git a/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs index b0ede20d41..4ca8d3fee3 100644 --- a/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs +++ b/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs @@ -3,9 +3,9 @@ module Simple.RemovePlugin where import Control.Monad.IO.Class import Data.List (intercalate) -import Plugins +import GHC.Driver.Plugins import Bag -import HscTypes +import GHC.Driver.Types import TcRnTypes import GHC.Hs.Extension import GHC.Hs.Expr diff --git a/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs index cb5fc70550..c16eea0c64 100644 --- a/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs +++ b/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs @@ -3,8 +3,8 @@ module Simple.SourcePlugin where import Control.Monad.IO.Class import Data.List (intercalate) import Data.Maybe (isJust) -import Plugins -import HscTypes +import GHC.Driver.Plugins +import GHC.Driver.Types import TcRnTypes import GHC.Hs.Extension import Avail diff --git a/testsuite/tests/plugins/simple-plugin/Simple/TrustworthyPlugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/TrustworthyPlugin.hs index c2b4568de3..fb5df22e7d 100644 --- a/testsuite/tests/plugins/simple-plugin/Simple/TrustworthyPlugin.hs +++ b/testsuite/tests/plugins/simple-plugin/Simple/TrustworthyPlugin.hs @@ -1,6 +1,6 @@ module Simple.TrustworthyPlugin (plugin) where -import GhcPlugins +import GHC.Plugins import TcRnMonad plugin :: Plugin diff --git a/testsuite/tests/plugins/static-plugins.hs b/testsuite/tests/plugins/static-plugins.hs index 3dd6aa2e6d..77d451451a 100644 --- a/testsuite/tests/plugins/static-plugins.hs +++ b/testsuite/tests/plugins/static-plugins.hs @@ -2,7 +2,7 @@ module Main where import Avail import Control.Monad.IO.Class -import DynFlags +import GHC.Driver.Session (getDynFlags, parseDynamicFlagsCmdLine, defaultFatalMessager, defaultFlushOut) import GHC import GHC.Fingerprint.Type @@ -11,9 +11,9 @@ import GHC.Hs.Doc import GHC.Hs.Expr import GHC.Hs.Extension import GHC.Hs.ImpExp -import HscTypes +import GHC.Driver.Types import Outputable -import Plugins +import GHC.Driver.Plugins import System.Environment import TcRnTypes diff --git a/testsuite/tests/quasiquotation/T7918.hs b/testsuite/tests/quasiquotation/T7918.hs index 507f4b3ee8..a5a2ddfb70 100644 --- a/testsuite/tests/quasiquotation/T7918.hs +++ b/testsuite/tests/quasiquotation/T7918.hs @@ -2,7 +2,7 @@ module Main (main) where import GHC -import DynFlags +import GHC.Driver.Session import Outputable import MonadUtils import NameSet diff --git a/testsuite/tests/regalloc/regalloc_unit_tests.hs b/testsuite/tests/regalloc/regalloc_unit_tests.hs index cf632f1cd5..0732b03fbb 100644 --- a/testsuite/tests/regalloc/regalloc_unit_tests.hs +++ b/testsuite/tests/regalloc/regalloc_unit_tests.hs @@ -23,7 +23,7 @@ module Main where import qualified RegAlloc.Graph.Stats as Color import qualified RegAlloc.Linear.Base as Linear import qualified X86.Instr -import HscMain +import GHC.Driver.Main import GHC.StgToCmm.CgUtils import AsmCodeGen import GHC.Cmm.Info.Build @@ -34,10 +34,10 @@ import GHC.Cmm import Module import GHC.Cmm.DebugBlock import GHC -import GhcMonad +import GHC.Driver.Monad import UniqFM import UniqSupply -import DynFlags +import GHC.Driver.Session import ErrUtils import Outputable import BasicTypes diff --git a/testsuite/tests/rts/linker/LinkerUnload.hs b/testsuite/tests/rts/linker/LinkerUnload.hs index d26fae57ea..d534be795d 100644 --- a/testsuite/tests/rts/linker/LinkerUnload.hs +++ b/testsuite/tests/rts/linker/LinkerUnload.hs @@ -1,7 +1,7 @@ module LinkerUnload (init) where import GHC -import DynFlags +import GHC.Driver.Session import GHC.Runtime.Linker as Linker import System.Environment import MonadUtils ( MonadIO(..) ) diff --git a/testsuite/tests/simplCore/should_compile/T7702plugin/T7702Plugin.hs b/testsuite/tests/simplCore/should_compile/T7702plugin/T7702Plugin.hs index e411d04e67..f063ab7615 100644 --- a/testsuite/tests/simplCore/should_compile/T7702plugin/T7702Plugin.hs +++ b/testsuite/tests/simplCore/should_compile/T7702plugin/T7702Plugin.hs @@ -1,6 +1,6 @@ module T7702Plugin ( plugin ) where -import GhcPlugins +import GHC.Plugins -- A plugin that does nothing but tickle CoreM's writer. plugin :: Plugin diff --git a/testsuite/tests/typecheck/should_compile/T11462_Plugin.hs b/testsuite/tests/typecheck/should_compile/T11462_Plugin.hs index 5d98395d6a..bc57d16089 100644 --- a/testsuite/tests/typecheck/should_compile/T11462_Plugin.hs +++ b/testsuite/tests/typecheck/should_compile/T11462_Plugin.hs @@ -1,7 +1,7 @@ module T11462_Plugin(plugin) where import TcRnMonad ( TcPlugin(..), TcPluginResult(..) ) -import Plugins ( defaultPlugin, Plugin(..), CommandLineOption ) +import GHC.Driver.Plugins ( defaultPlugin, Plugin(..), CommandLineOption ) plugin :: Plugin plugin = defaultPlugin { tcPlugin = Just . thePlugin } diff --git a/testsuite/tests/typecheck/should_compile/T11525_Plugin.hs b/testsuite/tests/typecheck/should_compile/T11525_Plugin.hs index bc1ffc4da0..5133b87b7f 100644 --- a/testsuite/tests/typecheck/should_compile/T11525_Plugin.hs +++ b/testsuite/tests/typecheck/should_compile/T11525_Plugin.hs @@ -1,7 +1,7 @@ module T11525_Plugin(plugin) where import TcRnMonad ( TcPlugin(..), TcPluginResult(..) ) -import Plugins ( defaultPlugin, Plugin(..), CommandLineOption ) +import GHC.Driver.Plugins ( defaultPlugin, Plugin(..), CommandLineOption ) plugin :: Plugin plugin = defaultPlugin { tcPlugin = Just . thePlugin } diff --git a/testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs b/testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs index 73552d63f9..1614b7ce42 100644 --- a/testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs +++ b/testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs @@ -2,7 +2,7 @@ module Main where import BasicTypes import GHC -import GhcMonad +import GHC.Driver.Monad import Outputable import GHC.Types.RepType import TysPrim |