summaryrefslogtreecommitdiff
path: root/testsuite/tests
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2019-09-11 21:19:39 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-09-20 05:14:34 -0400
commit5119296440e6846c553c72b8a93afc5ecfa576f0 (patch)
treeff508560a4996afffb24bf3af5dfa9c56a7e5c77 /testsuite/tests
parent4853d962289db1b32886ec73e824cd37c9c5c002 (diff)
downloadhaskell-5119296440e6846c553c72b8a93afc5ecfa576f0.tar.gz
Module hierarchy: Hs (#13009)
Add GHC.Hs module hierarchy replacing hsSyn. Metric Increase: haddock.compiler
Diffstat (limited to 'testsuite/tests')
-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/package/all.T2
-rw-r--r--testsuite/tests/package/package05.hs6
-rw-r--r--testsuite/tests/package/package06.hs4
-rw-r--r--testsuite/tests/package/package06e.hs2
-rw-r--r--testsuite/tests/package/package06e.stderr2
-rw-r--r--testsuite/tests/package/package07e.hs6
-rw-r--r--testsuite/tests/package/package07e.stderr8
-rw-r--r--testsuite/tests/package/package08e.hs6
-rw-r--r--testsuite/tests/package/package08e.stderr8
-rw-r--r--testsuite/tests/parser/should_fail/readFail001.hs2
-rw-r--r--testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs8
-rw-r--r--testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs10
-rw-r--r--testsuite/tests/plugins/static-plugins.hs10
-rw-r--r--testsuite/tests/pmcheck/should_compile/pmc009.hs2
16 files changed, 40 insertions, 40 deletions
diff --git a/testsuite/tests/ghc-api/annotations/stringSource.hs b/testsuite/tests/ghc-api/annotations/stringSource.hs
index 1b5803b817..8bae838672 100644
--- a/testsuite/tests/ghc-api/annotations/stringSource.hs
+++ b/testsuite/tests/ghc-api/annotations/stringSource.hs
@@ -17,7 +17,7 @@ import FastString
import ForeignCall
import MonadUtils
import Outputable
-import HsDecls
+import GHC.Hs.Decls
import Bag (filterBag,isEmptyBag)
import System.Directory (removeFile)
import System.Environment( getArgs )
diff --git a/testsuite/tests/ghc-api/annotations/t11430.hs b/testsuite/tests/ghc-api/annotations/t11430.hs
index 232d47ff98..f161e601ce 100644
--- a/testsuite/tests/ghc-api/annotations/t11430.hs
+++ b/testsuite/tests/ghc-api/annotations/t11430.hs
@@ -17,7 +17,7 @@ import FastString
import ForeignCall
import MonadUtils
import Outputable
-import HsDecls
+import GHC.Hs.Decls
import Bag (filterBag,isEmptyBag)
import System.Directory (removeFile)
import System.Environment( getArgs )
diff --git a/testsuite/tests/package/all.T b/testsuite/tests/package/all.T
index 869abb1a7a..8fe654fb7d 100644
--- a/testsuite/tests/package/all.T
+++ b/testsuite/tests/package/all.T
@@ -1,7 +1,7 @@
hide_all = '-hide-all-packages -XNoImplicitPrelude '
incr_containers = '-package "containers (Data.Map as Map, Data.Set)" '
inc_containers = '-package containers '
-incr_ghc = '-package "ghc (HsTypes as MyHsTypes, HsUtils)" '
+incr_ghc = '-package "ghc (GHC.Hs.Types as GHC.Hs.MyTypes, GHC.Hs.Utils)" '
inc_ghc = '-package ghc '
hide_ghc = '-hide-package ghc '
diff --git a/testsuite/tests/package/package05.hs b/testsuite/tests/package/package05.hs
index 3b0069c5d5..e2c1125321 100644
--- a/testsuite/tests/package/package05.hs
+++ b/testsuite/tests/package/package05.hs
@@ -1,4 +1,4 @@
module Package05 where
-import HsTypes
-import MyHsTypes
-import HsUtils
+import GHC.Hs.Types
+import GHC.Hs.MyTypes
+import GHC.Hs.Utils
diff --git a/testsuite/tests/package/package06.hs b/testsuite/tests/package/package06.hs
index 096b81b7ba..ce9ce6fb84 100644
--- a/testsuite/tests/package/package06.hs
+++ b/testsuite/tests/package/package06.hs
@@ -1,3 +1,3 @@
module Package06 where
-import MyHsTypes
-import HsUtils
+import GHC.Hs.MyTypes
+import GHC.Hs.Utils
diff --git a/testsuite/tests/package/package06e.hs b/testsuite/tests/package/package06e.hs
index 6feaebda62..35b6ceaa76 100644
--- a/testsuite/tests/package/package06e.hs
+++ b/testsuite/tests/package/package06e.hs
@@ -1,3 +1,3 @@
module Package06e where
-import HsTypes
+import GHC.Hs.Types
import UniqFM
diff --git a/testsuite/tests/package/package06e.stderr b/testsuite/tests/package/package06e.stderr
index 12d721223c..98f048c107 100644
--- a/testsuite/tests/package/package06e.stderr
+++ b/testsuite/tests/package/package06e.stderr
@@ -1,6 +1,6 @@
package06e.hs:2:1: error:
- Could not load module ‘HsTypes’
+ Could not load module ‘GHC.Hs.Types’
It is a member of the hidden package ‘ghc-8.7’.
You can run ‘:set -package ghc’ to expose it.
(Note: this unloads all the modules in the current scope.)
diff --git a/testsuite/tests/package/package07e.hs b/testsuite/tests/package/package07e.hs
index 85bb723989..df13ed734e 100644
--- a/testsuite/tests/package/package07e.hs
+++ b/testsuite/tests/package/package07e.hs
@@ -1,5 +1,5 @@
module Package07e where
-import MyHsTypes
-import HsTypes
-import HsUtils
+import GHC.Hs.MyTypes
+import GHC.Hs.Types
+import GHC.Hs.Utils
import UniqFM
diff --git a/testsuite/tests/package/package07e.stderr b/testsuite/tests/package/package07e.stderr
index 2678972a78..5f5f0b9885 100644
--- a/testsuite/tests/package/package07e.stderr
+++ b/testsuite/tests/package/package07e.stderr
@@ -1,18 +1,18 @@
package07e.hs:2:1: error:
- Could not find module ‘MyHsTypes’
- Perhaps you meant HsTypes (needs flag -package-key ghc-8.7)
+ Could not find module ‘GHC.Hs.MyTypes’
+ Perhaps you meant GHC.Hs.Types (needs flag -package-key ghc-8.7)
Use -v (or `:set -v` in ghci) to see a list of the files searched for.
package07e.hs:3:1: error:
- Could not load module ‘HsTypes’
+ Could not load module ‘GHC.Hs.Types’
It is a member of the hidden package ‘ghc-8.7’.
You can run ‘:set -package ghc’ to expose it.
(Note: this unloads all the modules in the current scope.)
Use -v (or `:set -v` in ghci) to see a list of the files searched for.
package07e.hs:4:1: error:
- Could not load module ‘HsUtils’
+ Could not load module ‘GHC.Hs.Utils’
It is a member of the hidden package ‘ghc-8.7’.
You can run ‘:set -package ghc’ to expose it.
(Note: this unloads all the modules in the current scope.)
diff --git a/testsuite/tests/package/package08e.hs b/testsuite/tests/package/package08e.hs
index 40f814449a..aba05de9ca 100644
--- a/testsuite/tests/package/package08e.hs
+++ b/testsuite/tests/package/package08e.hs
@@ -1,5 +1,5 @@
module Package08e where
-import MyHsTypes
-import HsTypes
-import HsUtils
+import GHC.Hs.MyTypes
+import GHC.Hs.Types
+import GHC.Hs.Utils
import UniqFM
diff --git a/testsuite/tests/package/package08e.stderr b/testsuite/tests/package/package08e.stderr
index f02e9d6da3..46d665bceb 100644
--- a/testsuite/tests/package/package08e.stderr
+++ b/testsuite/tests/package/package08e.stderr
@@ -1,18 +1,18 @@
package08e.hs:2:1: error:
- Could not find module ‘MyHsTypes’
- Perhaps you meant HsTypes (needs flag -package-key ghc-8.7)
+ Could not find module ‘GHC.Hs.MyTypes’
+ Perhaps you meant GHC.Hs.Types (needs flag -package-key ghc-8.7)
Use -v (or `:set -v` in ghci) to see a list of the files searched for.
package08e.hs:3:1: error:
- Could not load module ‘HsTypes’
+ Could not load module ‘GHC.Hs.Types’
It is a member of the hidden package ‘ghc-8.7’.
You can run ‘:set -package ghc’ to expose it.
(Note: this unloads all the modules in the current scope.)
Use -v (or `:set -v` in ghci) to see a list of the files searched for.
package08e.hs:4:1: error:
- Could not load module ‘HsUtils’
+ Could not load module ‘GHC.Hs.Utils’
It is a member of the hidden package ‘ghc-8.7’.
You can run ‘:set -package ghc’ to expose it.
(Note: this unloads all the modules in the current scope.)
diff --git a/testsuite/tests/parser/should_fail/readFail001.hs b/testsuite/tests/parser/should_fail/readFail001.hs
index 6b186922f3..a3faa1b5e5 100644
--- a/testsuite/tests/parser/should_fail/readFail001.hs
+++ b/testsuite/tests/parser/should_fail/readFail001.hs
@@ -51,7 +51,7 @@ instance (Eq a) => EqClass (Tree a) where
default (Integer, Rational)
--- HsBinds stuff
+-- GHC.Hs.Binds stuff
singlebind x = x
diff --git a/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs
index 2d14eeaf85..fce8b7d136 100644
--- a/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs
+++ b/testsuite/tests/plugins/simple-plugin/Simple/RemovePlugin.hs
@@ -7,12 +7,12 @@ import Plugins
import Bag
import HscTypes
import TcRnTypes
-import HsExtension
-import HsExpr
+import GHC.Hs.Extension
+import GHC.Hs.Expr
import Outputable
import SrcLoc
-import HsSyn
-import HsBinds
+import GHC.Hs
+import GHC.Hs.Binds
import OccName
import RdrName
import Name
diff --git a/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs
index b9bdaeb37a..cb5fc70550 100644
--- a/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs
+++ b/testsuite/tests/plugins/simple-plugin/Simple/SourcePlugin.hs
@@ -6,13 +6,13 @@ import Data.Maybe (isJust)
import Plugins
import HscTypes
import TcRnTypes
-import HsExtension
+import GHC.Hs.Extension
import Avail
-import HsExpr
+import GHC.Hs.Expr
import Outputable
-import HsImpExp
-import HsDecls
-import HsDoc
+import GHC.Hs.ImpExp
+import GHC.Hs.Decls
+import GHC.Hs.Doc
plugin :: Plugin
plugin = defaultPlugin { parsedResultAction = parsedPlugin
diff --git a/testsuite/tests/plugins/static-plugins.hs b/testsuite/tests/plugins/static-plugins.hs
index 36e18b86b5..3dd6aa2e6d 100644
--- a/testsuite/tests/plugins/static-plugins.hs
+++ b/testsuite/tests/plugins/static-plugins.hs
@@ -6,11 +6,11 @@ import DynFlags
(getDynFlags, parseDynamicFlagsCmdLine, defaultFatalMessager, defaultFlushOut)
import GHC
import GHC.Fingerprint.Type
-import HsDecls
-import HsDoc
-import HsExpr
-import HsExtension
-import HsImpExp
+import GHC.Hs.Decls
+import GHC.Hs.Doc
+import GHC.Hs.Expr
+import GHC.Hs.Extension
+import GHC.Hs.ImpExp
import HscTypes
import Outputable
import Plugins
diff --git a/testsuite/tests/pmcheck/should_compile/pmc009.hs b/testsuite/tests/pmcheck/should_compile/pmc009.hs
index ac8f5c2dd5..08f130de33 100644
--- a/testsuite/tests/pmcheck/should_compile/pmc009.hs
+++ b/testsuite/tests/pmcheck/should_compile/pmc009.hs
@@ -1,5 +1,5 @@
module HsUtils where
-import HsBinds
+import GHC.Hs.Binds
import SrcLoc