summaryrefslogtreecommitdiff
path: root/testsuite/tests
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/tests')
-rw-r--r--testsuite/tests/ghc-api/T18522-dbg-ppr.hs2
-rw-r--r--testsuite/tests/ghc-api/T4891/T4891.hs1
-rw-r--r--testsuite/tests/ghc-api/annotations-literals/parsed.hs1
-rw-r--r--testsuite/tests/ghc-api/annotations/stringSource.hs2
-rw-r--r--testsuite/tests/ghc-api/annotations/t11430.hs2
-rw-r--r--testsuite/tests/ghc-api/downsweep/OldModLocation.hs2
-rw-r--r--testsuite/tests/ghc-api/target-contents/TargetContents.hs3
-rw-r--r--testsuite/tests/parser/should_run/CountParserDeps.hs5
-rw-r--r--testsuite/tests/plugins/hooks-plugin/Hooks/Plugin.hs2
-rw-r--r--testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs2
-rw-r--r--testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs4
-rw-r--r--testsuite/tests/plugins/static-plugins.hs1
12 files changed, 16 insertions, 11 deletions
diff --git a/testsuite/tests/ghc-api/T18522-dbg-ppr.hs b/testsuite/tests/ghc-api/T18522-dbg-ppr.hs
index 8b31eb683d..f669bfbd6d 100644
--- a/testsuite/tests/ghc-api/T18522-dbg-ppr.hs
+++ b/testsuite/tests/ghc-api/T18522-dbg-ppr.hs
@@ -11,8 +11,8 @@ import GHC.Utils.Outputable
import GHC.Tc.Module
import GHC.Tc.Utils.Zonk
import GHC.Utils.Error
-import GHC.Driver.Types
import GHC.Driver.Ppr
+import GHC.Driver.Env
import GHC
import qualified GHC.LanguageExtensions as LangExt
diff --git a/testsuite/tests/ghc-api/T4891/T4891.hs b/testsuite/tests/ghc-api/T4891/T4891.hs
index 201293178d..89a8403b94 100644
--- a/testsuite/tests/ghc-api/T4891/T4891.hs
+++ b/testsuite/tests/ghc-api/T4891/T4891.hs
@@ -7,7 +7,6 @@ import Data.Array
import GHC.Core.DataCon
import GHC
import GHC.Exts.Heap
-import GHC.Driver.Types
import GHC.Driver.Ppr
import GHC.Runtime.Linker
import GHC.Runtime.Heap.Inspect
diff --git a/testsuite/tests/ghc-api/annotations-literals/parsed.hs b/testsuite/tests/ghc-api/annotations-literals/parsed.hs
index 3b35373f93..a97a067ce5 100644
--- a/testsuite/tests/ghc-api/annotations-literals/parsed.hs
+++ b/testsuite/tests/ghc-api/annotations-literals/parsed.hs
@@ -4,6 +4,7 @@
module Main where
import GHC.Types.Basic
+import GHC.Types.SourceText
import Data.Data
import Data.List (intercalate)
import System.IO
diff --git a/testsuite/tests/ghc-api/annotations/stringSource.hs b/testsuite/tests/ghc-api/annotations/stringSource.hs
index e281186dc9..b07b00a2ce 100644
--- a/testsuite/tests/ghc-api/annotations/stringSource.hs
+++ b/testsuite/tests/ghc-api/annotations/stringSource.hs
@@ -12,6 +12,8 @@ import Data.List (intercalate)
import System.IO
import GHC
import GHC.Types.Basic
+import GHC.Types.SourceText
+import GHC.Unit.Module.Warnings
import GHC.Driver.Session
import GHC.Driver.Ppr
import GHC.Data.FastString
diff --git a/testsuite/tests/ghc-api/annotations/t11430.hs b/testsuite/tests/ghc-api/annotations/t11430.hs
index a3a76dda96..0e702769c2 100644
--- a/testsuite/tests/ghc-api/annotations/t11430.hs
+++ b/testsuite/tests/ghc-api/annotations/t11430.hs
@@ -12,6 +12,8 @@ import Data.List (intercalate)
import System.IO
import GHC
import GHC.Types.Basic
+import GHC.Types.SourceText
+import GHC.Types.Fixity
import GHC.Driver.Session
import GHC.Driver.Ppr
import GHC.Data.FastString
diff --git a/testsuite/tests/ghc-api/downsweep/OldModLocation.hs b/testsuite/tests/ghc-api/downsweep/OldModLocation.hs
index d3aeddd0bc..76338b0f1e 100644
--- a/testsuite/tests/ghc-api/downsweep/OldModLocation.hs
+++ b/testsuite/tests/ghc-api/downsweep/OldModLocation.hs
@@ -3,7 +3,7 @@
import GHC
import GHC.Driver.Make
import GHC.Driver.Session
-import GHC.Driver.Finder
+import GHC.Unit.Finder
import Control.Monad.IO.Class (liftIO)
import Data.List (sort, stripPrefix)
diff --git a/testsuite/tests/ghc-api/target-contents/TargetContents.hs b/testsuite/tests/ghc-api/target-contents/TargetContents.hs
index f21b84ca87..4d8ecf1596 100644
--- a/testsuite/tests/ghc-api/target-contents/TargetContents.hs
+++ b/testsuite/tests/ghc-api/target-contents/TargetContents.hs
@@ -14,7 +14,8 @@ import Data.Time.Calendar
import Data.Time.Clock
import GHC.Utils.Exception
import GHC.Parser.Header
-import GHC.Driver.Types
+import GHC.Types.Target
+import GHC.Types.SourceError
import GHC.Utils.Outputable
import GHC.Data.StringBuffer
import System.Directory
diff --git a/testsuite/tests/parser/should_run/CountParserDeps.hs b/testsuite/tests/parser/should_run/CountParserDeps.hs
index bf84f2a0ac..a676fe79cc 100644
--- a/testsuite/tests/parser/should_run/CountParserDeps.hs
+++ b/testsuite/tests/parser/should_run/CountParserDeps.hs
@@ -10,7 +10,7 @@ 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 GHC.Driver.Types
+import GHC.Driver.Env
import GHC.Unit.Module
import GHC.Driver.Session
import GHC.Driver.Main
@@ -22,13 +22,14 @@ import Control.Monad.IO.Class
import System.Environment
import System.Exit
import GHC.Types.Unique.Set
+import GHC.Unit.Module.Deps
main :: IO ()
main = do
[libdir] <- getArgs
modules <- parserDeps libdir
let num = sizeUniqSet modules
- max_num = 205
+ max_num = 234
min_num = max_num - 10 -- so that we don't forget to change the number
-- when the number of dependencies decreases
-- putStrLn $ "Found " ++ show num ++ " parser module dependencies"
diff --git a/testsuite/tests/plugins/hooks-plugin/Hooks/Plugin.hs b/testsuite/tests/plugins/hooks-plugin/Hooks/Plugin.hs
index a74ac8cac3..616d202d29 100644
--- a/testsuite/tests/plugins/hooks-plugin/Hooks/Plugin.hs
+++ b/testsuite/tests/plugins/hooks-plugin/Hooks/Plugin.hs
@@ -1,7 +1,7 @@
{-# OPTIONS_GHC -Wall #-}
module Hooks.Plugin (plugin) where
-import GHC.Types.Basic
+import GHC.Types.SourceText
import GHC.Plugins
import GHC.Hs.Expr
import GHC.Hs.Extension
diff --git a/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs
index 1dba8ff3c0..13f5611948 100644
--- a/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs
+++ b/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs
@@ -4,8 +4,8 @@ module Simple.RemovePlugin where
import Control.Monad.IO.Class
import Data.List (intercalate)
import GHC.Driver.Plugins
+import GHC.Plugins
import GHC.Data.Bag
-import GHC.Driver.Types
import GHC.Tc.Types
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 dfadc4bc8b..6c11eba246 100644
--- a/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs
+++ b/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs
@@ -5,11 +5,11 @@ import Data.List (intercalate)
import Data.Maybe (isJust)
import GHC.Driver.Plugins
import GHC.Driver.Session
-import GHC.Driver.Types
-import GHC.Driver.Ppr
+import GHC.Plugins
import GHC.Tc.Types
import GHC.Hs.Extension
import GHC.Types.Avail
+import GHC.Hs
import GHC.Hs.Expr
import GHC.Utils.Outputable
import GHC.Hs.ImpExp
diff --git a/testsuite/tests/plugins/static-plugins.hs b/testsuite/tests/plugins/static-plugins.hs
index 47cbb462a2..f3433aa0ac 100644
--- a/testsuite/tests/plugins/static-plugins.hs
+++ b/testsuite/tests/plugins/static-plugins.hs
@@ -11,7 +11,6 @@ import GHC.Hs.Doc
import GHC.Hs.Expr
import GHC.Hs.Extension
import GHC.Hs.ImpExp
-import GHC.Driver.Types
import GHC.Utils.Outputable
import GHC.Driver.Plugins
import System.Environment
View Lorry Controller Status