diff options
Diffstat (limited to 'testsuite/tests')
44 files changed, 91 insertions, 91 deletions
diff --git a/testsuite/tests/annotations/should_run/annrun01.hs b/testsuite/tests/annotations/should_run/annrun01.hs index 4a587afddc..a18f662ebb 100644 --- a/testsuite/tests/annotations/should_run/annrun01.hs +++ b/testsuite/tests/annotations/should_run/annrun01.hs @@ -3,12 +3,12 @@ module Main where import GHC -import MonadUtils ( liftIO ) +import GHC.Utils.Monad ( liftIO ) import Data.Maybe import GHC.Driver.Session ( defaultFatalMessager, defaultFlushOut ) import GHC.Types.Annotations ( AnnTarget(..), CoreAnnTarget ) import GHC.Serialized ( deserializeWithData ) -import Panic +import GHC.Utils.Panic import Config import Annrun01_Help diff --git a/testsuite/tests/callarity/unittest/CallArity1.hs b/testsuite/tests/callarity/unittest/CallArity1.hs index 5a3820fd34..60cb97835f 100644 --- a/testsuite/tests/callarity/unittest/CallArity1.hs +++ b/testsuite/tests/callarity/unittest/CallArity1.hs @@ -8,8 +8,8 @@ import GHC.Core.Opt.CallArity (callArityRHS) import GHC.Types.Id.Make import GHC.SysTools import GHC.Driver.Session -import ErrUtils -import Outputable +import GHC.Utils.Error +import GHC.Utils.Outputable as Outputable import GHC.Builtin.Types import GHC.Types.Literal import GHC @@ -21,7 +21,7 @@ import GHC.Core.Ppr import GHC.Types.Unique import GHC.Types.Unique.Set import GHC.Core.Lint -import FastString +import GHC.Data.FastString -- Build IDs. use mkTemplateLocal, more predictable than proper uniques go, go2, x, d, n, y, z, scrutf, scruta :: Id diff --git a/testsuite/tests/concurrent/prog001/Arithmetic.hs b/testsuite/tests/concurrent/prog001/Arithmetic.hs index bce3ff6400..183b66c0ed 100644 --- a/testsuite/tests/concurrent/prog001/Arithmetic.hs +++ b/testsuite/tests/concurrent/prog001/Arithmetic.hs @@ -5,7 +5,7 @@ import Control.Concurrent.MVar import System.IO.Unsafe import Utilities import Converter -import Stream +import GHC.Data.Stream import Data.Ratio import Trit diff --git a/testsuite/tests/concurrent/prog001/Converter.hs b/testsuite/tests/concurrent/prog001/Converter.hs index cba86e0cfd..ba4132dc43 100644 --- a/testsuite/tests/concurrent/prog001/Converter.hs +++ b/testsuite/tests/concurrent/prog001/Converter.hs @@ -1,7 +1,7 @@ module Converter (rationalToGray, grayToSignIO, signToGray, Gray, startF, startC) where -import Stream +import GHC.Data.Stream import Data.Ratio import Control.Concurrent import Control.Concurrent.MVar diff --git a/testsuite/tests/concurrent/prog001/Thread.hs b/testsuite/tests/concurrent/prog001/Thread.hs index 12886a8456..18799607a1 100644 --- a/testsuite/tests/concurrent/prog001/Thread.hs +++ b/testsuite/tests/concurrent/prog001/Thread.hs @@ -3,7 +3,7 @@ module Thread (threadTesting1) where import Control.Concurrent import Control.Concurrent.MVar -import Stream +import GHC.Data.Stream import Converter threadTesting1 :: Gray -> Gray -> IO Int diff --git a/testsuite/tests/concurrent/prog001/Trit.hs b/testsuite/tests/concurrent/prog001/Trit.hs index 8674d6510b..f81bc8bf21 100644 --- a/testsuite/tests/concurrent/prog001/Trit.hs +++ b/testsuite/tests/concurrent/prog001/Trit.hs @@ -2,7 +2,7 @@ module Trit (Trit, rationalToTrit, getIntegral, getFraction, getFraction', neg, addTrits, subTrits, shiftLeft, shiftRight, multiply ) where -import Stream +import GHC.Data.Stream import Utilities import Data.Ratio diff --git a/testsuite/tests/concurrent/prog001/Utilities.hs b/testsuite/tests/concurrent/prog001/Utilities.hs index 0ebdb3db9c..faa15d8f8c 100644 --- a/testsuite/tests/concurrent/prog001/Utilities.hs +++ b/testsuite/tests/concurrent/prog001/Utilities.hs @@ -1,6 +1,6 @@ module Utilities (toBinary, fl) where -import Stream +import GHC.Data.Stream import Data.Ratio -- Convert from an Integer to its signed-digit representation diff --git a/testsuite/tests/determinism/determ001/determinism001.hs b/testsuite/tests/determinism/determ001/determinism001.hs index 6de1e673d0..283beaf098 100644 --- a/testsuite/tests/determinism/determ001/determinism001.hs +++ b/testsuite/tests/determinism/determ001/determinism001.hs @@ -1,6 +1,6 @@ module Main where -import Digraph +import GHC.Data.Graph.Directed main = mapM_ print [ test001 diff --git a/testsuite/tests/ghc-api/T10942.hs b/testsuite/tests/ghc-api/T10942.hs index 3598751676..a6cee0fd7f 100644 --- a/testsuite/tests/ghc-api/T10942.hs +++ b/testsuite/tests/ghc-api/T10942.hs @@ -6,8 +6,8 @@ import GHC import Control.Monad.IO.Class (liftIO) import System.Environment import GHC.Parser.Header -import Outputable -import StringBuffer +import GHC.Utils.Outputable +import GHC.Data.StringBuffer main :: IO () main = do diff --git a/testsuite/tests/ghc-api/T11579.hs b/testsuite/tests/ghc-api/T11579.hs index 9e45410d2e..7ea08c9216 100644 --- a/testsuite/tests/ghc-api/T11579.hs +++ b/testsuite/tests/ghc-api/T11579.hs @@ -1,8 +1,8 @@ import System.Environment import GHC.Driver.Session -import FastString +import GHC.Data.FastString import GHC -import StringBuffer +import GHC.Data.StringBuffer import GHC.Parser.Lexer import GHC.Types.SrcLoc diff --git a/testsuite/tests/ghc-api/T4891/T4891.hs b/testsuite/tests/ghc-api/T4891/T4891.hs index 9c897f7e10..4da3acba18 100644 --- a/testsuite/tests/ghc-api/T4891/T4891.hs +++ b/testsuite/tests/ghc-api/T4891/T4891.hs @@ -19,8 +19,8 @@ import GHC.Types.Name (getOccString) import Unsafe.Coerce import Control.Monad import Data.Maybe -import Bag -import Outputable +import GHC.Data.Bag +import GHC.Utils.Outputable import GHC.Driver.Monad import X diff --git a/testsuite/tests/ghc-api/T6145.hs b/testsuite/tests/ghc-api/T6145.hs index 56538e11d6..7c56320ff3 100644 --- a/testsuite/tests/ghc-api/T6145.hs +++ b/testsuite/tests/ghc-api/T6145.hs @@ -6,9 +6,9 @@ module Main where import System.IO import GHC -import MonadUtils -import Outputable -import Bag (filterBag,isEmptyBag) +import GHC.Utils.Monad +import GHC.Utils.Outputable +import GHC.Data.Bag (filterBag,isEmptyBag) import System.Directory (removeFile) import System.Environment( getArgs ) diff --git a/testsuite/tests/ghc-api/T7478/T7478.hs b/testsuite/tests/ghc-api/T7478/T7478.hs index 4aa6f7d29e..ae8bb82e88 100644 --- a/testsuite/tests/ghc-api/T7478/T7478.hs +++ b/testsuite/tests/ghc-api/T7478/T7478.hs @@ -7,9 +7,9 @@ import System.Environment import GHC import qualified Config as GHC -import qualified Outputable as GHC +import qualified GHC.Utils.Outputable as GHC import GHC.Driver.Monad (liftIO) -import Outputable (PprStyle, queryQual) +import GHC.Utils.Outputable (PprStyle, queryQual) compileInGhc :: [FilePath] -- ^ Targets -> (String -> IO ()) -- ^ handler for each SevOutput message diff --git a/testsuite/tests/ghc-api/T8628.hs b/testsuite/tests/ghc-api/T8628.hs index a7cbdaa07c..9e8fd84fcb 100644 --- a/testsuite/tests/ghc-api/T8628.hs +++ b/testsuite/tests/ghc-api/T8628.hs @@ -3,12 +3,12 @@ module Main where import System.IO import GHC.Driver.Session import GHC -import Exception +import GHC.Utils.Exception import GHC.Types.Module -import FastString -import MonadUtils -import Outputable -import Bag (filterBag,isEmptyBag) +import GHC.Data.FastString +import GHC.Utils.Monad +import GHC.Utils.Outputable +import GHC.Data.Bag (filterBag,isEmptyBag) import System.Directory (removeFile) import System.Environment( getArgs ) import GHC.Builtin.Names diff --git a/testsuite/tests/ghc-api/T8639_api.hs b/testsuite/tests/ghc-api/T8639_api.hs index eab7ff9146..48024f6726 100644 --- a/testsuite/tests/ghc-api/T8639_api.hs +++ b/testsuite/tests/ghc-api/T8639_api.hs @@ -2,7 +2,7 @@ module Main where import GHC import GHC.Driver.Monad -import Outputable +import GHC.Utils.Outputable import System.IO import System.Environment( getArgs ) diff --git a/testsuite/tests/ghc-api/T9595.hs b/testsuite/tests/ghc-api/T9595.hs index 808fd8e79c..0080ae9bc5 100644 --- a/testsuite/tests/ghc-api/T9595.hs +++ b/testsuite/tests/ghc-api/T9595.hs @@ -3,7 +3,7 @@ module Main where import GHC import GHC.Driver.Packages import GHC.Driver.Monad -import Outputable +import GHC.Utils.Outputable import System.Environment import GHC.Driver.Session import GHC.Types.Module @@ -14,7 +14,7 @@ main = dflags <- getSessionDynFlags setSessionDynFlags dflags dflags <- getSessionDynFlags - liftIO $ print (mkModuleName "Outputable" `elem` listVisibleModuleNames dflags) + liftIO $ print (mkModuleName "GHC.Utils.Outputable" `elem` listVisibleModuleNames dflags) _ <- runGhc (Just libdir) $ do dflags <- getSessionDynFlags setSessionDynFlags (dflags { @@ -23,5 +23,5 @@ main = (ModRenaming True [])] }) dflags <- getSessionDynFlags - liftIO $ print (mkModuleName "Outputable" `elem` listVisibleModuleNames dflags) + liftIO $ print (mkModuleName "GHC.Utils.Outputable" `elem` listVisibleModuleNames dflags) return () diff --git a/testsuite/tests/ghc-api/annotations-literals/literals.hs b/testsuite/tests/ghc-api/annotations-literals/literals.hs index c125ea6e43..64c0311c07 100644 --- a/testsuite/tests/ghc-api/annotations-literals/literals.hs +++ b/testsuite/tests/ghc-api/annotations-literals/literals.hs @@ -8,9 +8,9 @@ import Data.List (intercalate) import System.IO import GHC import GHC.Driver.Session -import MonadUtils -import Outputable -import Bag (filterBag,isEmptyBag) +import GHC.Utils.Monad +import GHC.Utils.Outputable +import GHC.Data.Bag (filterBag,isEmptyBag) import System.Directory (removeFile) import System.Environment( getArgs ) import qualified Data.Map as Map diff --git a/testsuite/tests/ghc-api/annotations-literals/parsed.hs b/testsuite/tests/ghc-api/annotations-literals/parsed.hs index 56add861ad..620bf0451e 100644 --- a/testsuite/tests/ghc-api/annotations-literals/parsed.hs +++ b/testsuite/tests/ghc-api/annotations-literals/parsed.hs @@ -9,9 +9,9 @@ import Data.List (intercalate) import System.IO import GHC import GHC.Driver.Session -import MonadUtils -import Outputable -import Bag (filterBag,isEmptyBag) +import GHC.Utils.Monad +import GHC.Utils.Outputable +import GHC.Data.Bag (filterBag,isEmptyBag) import System.Directory (removeFile) import System.Environment( getArgs ) import qualified Data.Map as Map diff --git a/testsuite/tests/ghc-api/annotations/CheckUtils.hs b/testsuite/tests/ghc-api/annotations/CheckUtils.hs index 275067ac8a..3f79f48e28 100644 --- a/testsuite/tests/ghc-api/annotations/CheckUtils.hs +++ b/testsuite/tests/ghc-api/annotations/CheckUtils.hs @@ -10,10 +10,10 @@ import System.IO import GHC import GHC.Types.Basic import GHC.Driver.Session -import MonadUtils -import Outputable +import GHC.Utils.Monad +import GHC.Utils.Outputable import GHC.Parser.Annotation -import Bag (filterBag,isEmptyBag) +import GHC.Data.Bag (filterBag,isEmptyBag) import System.Directory (removeFile) import System.Environment( getArgs ) import qualified Data.Map as Map diff --git a/testsuite/tests/ghc-api/annotations/annotations.hs b/testsuite/tests/ghc-api/annotations/annotations.hs index d9157511aa..8347b57ffc 100644 --- a/testsuite/tests/ghc-api/annotations/annotations.hs +++ b/testsuite/tests/ghc-api/annotations/annotations.hs @@ -10,9 +10,9 @@ import Data.List (intercalate) import System.IO import GHC import GHC.Driver.Session -import MonadUtils -import Outputable -import Bag (filterBag,isEmptyBag) +import GHC.Utils.Monad +import GHC.Utils.Outputable +import GHC.Data.Bag (filterBag,isEmptyBag) import System.Directory (removeFile) import System.Environment( getArgs ) import qualified Data.Map as Map diff --git a/testsuite/tests/ghc-api/annotations/comments.hs b/testsuite/tests/ghc-api/annotations/comments.hs index 60d30426b1..4da8cbda54 100644 --- a/testsuite/tests/ghc-api/annotations/comments.hs +++ b/testsuite/tests/ghc-api/annotations/comments.hs @@ -10,9 +10,9 @@ import Data.List (intercalate) import System.IO import GHC import GHC.Driver.Session -import MonadUtils -import Outputable -import Bag (filterBag,isEmptyBag) +import GHC.Utils.Monad +import GHC.Utils.Outputable +import GHC.Data.Bag (filterBag,isEmptyBag) import System.Directory (removeFile) import System.Environment( getArgs ) import qualified Data.Map as Map diff --git a/testsuite/tests/ghc-api/annotations/listcomps.hs b/testsuite/tests/ghc-api/annotations/listcomps.hs index cd5eb86927..ddc0b7ec7f 100644 --- a/testsuite/tests/ghc-api/annotations/listcomps.hs +++ b/testsuite/tests/ghc-api/annotations/listcomps.hs @@ -11,10 +11,10 @@ import System.IO import GHC import GHC.Types.Basic import GHC.Driver.Session -import MonadUtils -import Outputable +import GHC.Utils.Monad +import GHC.Utils.Outputable import GHC.Parser.Annotation -import Bag (filterBag,isEmptyBag) +import GHC.Data.Bag (filterBag,isEmptyBag) import System.Directory (removeFile) import System.Environment( getArgs ) import System.Exit diff --git a/testsuite/tests/ghc-api/annotations/parseTree.hs b/testsuite/tests/ghc-api/annotations/parseTree.hs index af2aeb6cb5..9c167787be 100644 --- a/testsuite/tests/ghc-api/annotations/parseTree.hs +++ b/testsuite/tests/ghc-api/annotations/parseTree.hs @@ -11,9 +11,9 @@ import System.IO import GHC import GHC.Types.Basic import GHC.Driver.Session -import MonadUtils -import Outputable -import Bag (filterBag,isEmptyBag) +import GHC.Utils.Monad +import GHC.Utils.Outputable +import GHC.Data.Bag (filterBag,isEmptyBag) import System.Directory (removeFile) import System.Environment( getArgs ) import qualified Data.Map as Map diff --git a/testsuite/tests/ghc-api/annotations/stringSource.hs b/testsuite/tests/ghc-api/annotations/stringSource.hs index b3b4c85cca..776aebd048 100644 --- a/testsuite/tests/ghc-api/annotations/stringSource.hs +++ b/testsuite/tests/ghc-api/annotations/stringSource.hs @@ -13,12 +13,12 @@ import System.IO import GHC import GHC.Types.Basic import GHC.Driver.Session -import FastString +import GHC.Data.FastString import GHC.Types.ForeignCall -import MonadUtils -import Outputable +import GHC.Utils.Monad +import GHC.Utils.Outputable import GHC.Hs.Decls -import Bag (filterBag,isEmptyBag) +import GHC.Data.Bag (filterBag,isEmptyBag) import System.Directory (removeFile) import System.Environment( getArgs ) import qualified Data.Map as Map diff --git a/testsuite/tests/ghc-api/annotations/t11430.hs b/testsuite/tests/ghc-api/annotations/t11430.hs index aa51c4118e..d8be3d1043 100644 --- a/testsuite/tests/ghc-api/annotations/t11430.hs +++ b/testsuite/tests/ghc-api/annotations/t11430.hs @@ -13,12 +13,12 @@ import System.IO import GHC import GHC.Types.Basic import GHC.Driver.Session -import FastString +import GHC.Data.FastString import GHC.Types.ForeignCall -import MonadUtils -import Outputable +import GHC.Utils.Monad +import GHC.Utils.Outputable import GHC.Hs.Decls -import Bag (filterBag,isEmptyBag) +import GHC.Data.Bag (filterBag,isEmptyBag) import System.Directory (removeFile) import System.Environment( getArgs ) import qualified Data.Map as Map diff --git a/testsuite/tests/ghc-api/apirecomp001/myghc.hs b/testsuite/tests/ghc-api/apirecomp001/myghc.hs index 8c6f7b867b..0b65d5add6 100644 --- a/testsuite/tests/ghc-api/apirecomp001/myghc.hs +++ b/testsuite/tests/ghc-api/apirecomp001/myghc.hs @@ -11,9 +11,9 @@ module Main where import GHC import GHC.Driver.Session -import MonadUtils ( MonadIO(..) ) +import GHC.Utils.Monad ( MonadIO(..) ) import GHC.Types.Basic ( failed ) -import Bag ( bagToList ) +import GHC.Data.Bag ( bagToList ) import System.Environment import Control.Monad import System.IO diff --git a/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs b/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs index df6a2b63f6..b0c6ce2761 100644 --- a/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs +++ b/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs @@ -6,9 +6,9 @@ import GHC import GHC.Driver.Make import GHC.Driver.Session -import Outputable -import Exception (ExceptionMonad, ghandle) -import Bag +import GHC.Utils.Outputable +import GHC.Utils.Exception (ExceptionMonad, ghandle) +import GHC.Data.Bag import Control.Monad import Control.Monad.IO.Class (liftIO) diff --git a/testsuite/tests/ghc-api/dynCompileExpr/dynCompileExpr.hs b/testsuite/tests/ghc-api/dynCompileExpr/dynCompileExpr.hs index 9cdd3f0b7d..dd2b6383e2 100644 --- a/testsuite/tests/ghc-api/dynCompileExpr/dynCompileExpr.hs +++ b/testsuite/tests/ghc-api/dynCompileExpr/dynCompileExpr.hs @@ -2,7 +2,7 @@ module Main where import GHC -import MonadUtils +import GHC.Utils.Monad import System.Environment diff --git a/testsuite/tests/ghc-api/show-srcspan/showsrcspan.hs b/testsuite/tests/ghc-api/show-srcspan/showsrcspan.hs index 9a2993f7a8..01b0bc1a8f 100644 --- a/testsuite/tests/ghc-api/show-srcspan/showsrcspan.hs +++ b/testsuite/tests/ghc-api/show-srcspan/showsrcspan.hs @@ -3,11 +3,11 @@ module Main where import Data.Data import System.IO import GHC -import FastString +import GHC.Data.FastString import GHC.Types.SrcLoc -import MonadUtils -import Outputable -import Bag (filterBag,isEmptyBag) +import GHC.Utils.Monad +import GHC.Utils.Outputable +import GHC.Data.Bag (filterBag,isEmptyBag) import System.Directory (removeFile) import System.Environment( getArgs ) diff --git a/testsuite/tests/ghc-api/target-contents/TargetContents.hs b/testsuite/tests/ghc-api/target-contents/TargetContents.hs index f71d1131e3..a5ef99105f 100644 --- a/testsuite/tests/ghc-api/target-contents/TargetContents.hs +++ b/testsuite/tests/ghc-api/target-contents/TargetContents.hs @@ -11,11 +11,11 @@ import Data.List (intercalate) import Data.Maybe import Data.Time.Calendar import Data.Time.Clock -import Exception +import GHC.Utils.Exception import GHC.Parser.Header import GHC.Driver.Types -import Outputable -import StringBuffer +import GHC.Utils.Outputable +import GHC.Data.StringBuffer import System.Directory import System.Environment import System.Process diff --git a/testsuite/tests/ghci/linking/dyn/T3372.hs b/testsuite/tests/ghci/linking/dyn/T3372.hs index 49b71488c2..3234ff9cdf 100644 --- a/testsuite/tests/ghci/linking/dyn/T3372.hs +++ b/testsuite/tests/ghci/linking/dyn/T3372.hs @@ -11,7 +11,7 @@ import Control.Concurrent.Chan import GHC ( Ghc ) import qualified GHC -import qualified MonadUtils as GHC +import qualified GHC.Utils.Monad as GHC import qualified GHC.Exts diff --git a/testsuite/tests/parser/should_run/CountParserDeps.hs b/testsuite/tests/parser/should_run/CountParserDeps.hs index 03313fb66f..c0b1445dc6 100644 --- a/testsuite/tests/parser/should_run/CountParserDeps.hs +++ b/testsuite/tests/parser/should_run/CountParserDeps.hs @@ -15,7 +15,7 @@ import GHC.Types.Module import GHC.Driver.Session import GHC.Driver.Main import GHC -import Util +import GHC.Utils.Misc import Data.Maybe import Control.Monad import Control.Monad.IO.Class diff --git a/testsuite/tests/parser/unicode/T6016.hs b/testsuite/tests/parser/unicode/T6016.hs index 5783a72843..60a8b206a7 100644 --- a/testsuite/tests/parser/unicode/T6016.hs +++ b/testsuite/tests/parser/unicode/T6016.hs @@ -4,7 +4,7 @@ import Control.Exception import Data.Char import System.IO -import StringBuffer +import GHC.Data.StringBuffer twoBOMs = "T6016-twoBOMs" diff --git a/testsuite/tests/plugins/simple-plugin/Simple/Plugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/Plugin.hs index f3ba8ff8df..45a0205eb0 100644 --- a/testsuite/tests/plugins/simple-plugin/Simple/Plugin.hs +++ b/testsuite/tests/plugins/simple-plugin/Simple/Plugin.hs @@ -4,7 +4,7 @@ module Simple.Plugin(plugin) where import GHC.Types.Unique.FM import GHC.Plugins -import qualified ErrUtils +import qualified GHC.Utils.Error -- For annotation tests import Simple.DataStructures diff --git a/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs index 8ee017e61b..610a0c188e 100644 --- a/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs +++ b/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs @@ -4,12 +4,12 @@ module Simple.RemovePlugin where import Control.Monad.IO.Class import Data.List (intercalate) import GHC.Driver.Plugins -import Bag +import GHC.Data.Bag import GHC.Driver.Types import GHC.Tc.Types import GHC.Hs.Extension import GHC.Hs.Expr -import Outputable +import GHC.Utils.Outputable import GHC.Types.SrcLoc import GHC.Hs import GHC.Hs.Binds diff --git a/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs index 36ea230281..4e0eec36c0 100644 --- a/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs +++ b/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs @@ -9,7 +9,7 @@ import GHC.Tc.Types import GHC.Hs.Extension import GHC.Types.Avail import GHC.Hs.Expr -import Outputable +import GHC.Utils.Outputable import GHC.Hs.ImpExp import GHC.Hs.Decls import GHC.Hs.Doc diff --git a/testsuite/tests/plugins/static-plugins.hs b/testsuite/tests/plugins/static-plugins.hs index 77a5280bef..47cbb462a2 100644 --- a/testsuite/tests/plugins/static-plugins.hs +++ b/testsuite/tests/plugins/static-plugins.hs @@ -12,7 +12,7 @@ import GHC.Hs.Expr import GHC.Hs.Extension import GHC.Hs.ImpExp import GHC.Driver.Types -import Outputable +import GHC.Utils.Outputable import GHC.Driver.Plugins import System.Environment import GHC.Tc.Types diff --git a/testsuite/tests/pmcheck/should_compile/T11195.hs b/testsuite/tests/pmcheck/should_compile/T11195.hs index 57e2b44276..dca79500ac 100644 --- a/testsuite/tests/pmcheck/should_compile/T11195.hs +++ b/testsuite/tests/pmcheck/should_compile/T11195.hs @@ -10,7 +10,7 @@ import GHC.Core.Coercion.Axiom import GHC.Tc.Utils.TcType ( exactTyCoVarsOfType ) import GHC.Types.Var.Set import GHC.Types.Var.Env -import Pair +import GHC.Data.Pair type NormalCo = Coercion type NormalNonIdCo = NormalCo -- Extra invariant: not the identity diff --git a/testsuite/tests/quasiquotation/T7918.hs b/testsuite/tests/quasiquotation/T7918.hs index d322a7f11e..1a7de12d42 100644 --- a/testsuite/tests/quasiquotation/T7918.hs +++ b/testsuite/tests/quasiquotation/T7918.hs @@ -3,8 +3,8 @@ module Main (main) where import GHC import GHC.Driver.Session -import Outputable -import MonadUtils +import GHC.Utils.Outputable +import GHC.Utils.Monad import GHC.Types.Name.Set import GHC.Types.Var import GHC.Types.SrcLoc as SrcLoc diff --git a/testsuite/tests/regalloc/regalloc_unit_tests.hs b/testsuite/tests/regalloc/regalloc_unit_tests.hs index efe955414c..932d98b5c8 100644 --- a/testsuite/tests/regalloc/regalloc_unit_tests.hs +++ b/testsuite/tests/regalloc/regalloc_unit_tests.hs @@ -40,11 +40,11 @@ import GHC.Driver.Monad import GHC.Types.Unique.FM import GHC.Types.Unique.Supply import GHC.Driver.Session -import ErrUtils -import Outputable +import GHC.Utils.Error +import GHC.Utils.Outputable import GHC.Types.Basic -import Stream (collect, yield) +import GHC.Data.Stream as Stream (collect, yield) import Data.Typeable import Data.Maybe diff --git a/testsuite/tests/rts/linker/LinkerUnload.hs b/testsuite/tests/rts/linker/LinkerUnload.hs index d534be795d..af71cadfac 100644 --- a/testsuite/tests/rts/linker/LinkerUnload.hs +++ b/testsuite/tests/rts/linker/LinkerUnload.hs @@ -4,7 +4,7 @@ import GHC import GHC.Driver.Session import GHC.Runtime.Linker as Linker import System.Environment -import MonadUtils ( MonadIO(..) ) +import GHC.Utils.Monad ( MonadIO(..) ) foreign export ccall loadPackages :: IO () diff --git a/testsuite/tests/rts/linker/rdynamic.hs b/testsuite/tests/rts/linker/rdynamic.hs index bbbe9e898d..d36360745a 100644 --- a/testsuite/tests/rts/linker/rdynamic.hs +++ b/testsuite/tests/rts/linker/rdynamic.hs @@ -12,7 +12,7 @@ import Foreign.C.String ( withCString, CString ) import GHC.Exts ( addrToAny# ) import GHC.Ptr ( Ptr(..), nullPtr ) import System.Info ( os, arch ) -import Encoding +import GHC.Utils.Encoding main = (loadFunction Nothing "Main" "f" :: IO (Maybe String)) >>= print diff --git a/testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs b/testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs index 8d5c7756d9..e9cd3f34f4 100644 --- a/testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs +++ b/testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs @@ -3,7 +3,7 @@ module Main where import GHC.Types.Basic import GHC import GHC.Driver.Monad -import Outputable +import GHC.Utils.Outputable import GHC.Types.RepType import GHC.Builtin.Types.Prim import GHC.Builtin.Types diff --git a/testsuite/tests/utils/should_run/T14854.hs b/testsuite/tests/utils/should_run/T14854.hs index 9187639d6d..ce6ac4b024 100644 --- a/testsuite/tests/utils/should_run/T14854.hs +++ b/testsuite/tests/utils/should_run/T14854.hs @@ -1,7 +1,7 @@ {-# LANGUAGE RecordWildCards #-} module Main (main) where -import FastString +import GHC.Data.FastString import Control.Concurrent import Control.DeepSeq |