Rename GHC.Hs.Types into GHC.Hs.Type

See discussion in https://gitlab.haskell.org/ghc/ghc/issues/13009#note_268610

8 files changed, 10 insertions, 10 deletions

diff --git a/testsuite/tests/package/all.T b/testsuite/tests/package/all.T
index 6aebce6ce5..ab84cc99f8 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 (GHC.Hs.Types as GHC.Hs.MyTypes, GHC.Hs.Utils)" '
+incr_ghc = '-package "ghc (GHC.Hs.Type 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 e2c1125321..e8a3ab7409 100644
--- a/testsuite/tests/package/package05.hs
+++ b/testsuite/tests/package/package05.hs
@@ -1,4 +1,4 @@
 module Package05 where
-import GHC.Hs.Types
+import GHC.Hs.Type
 import GHC.Hs.MyTypes
 import GHC.Hs.Utils
diff --git a/testsuite/tests/package/package06e.hs b/testsuite/tests/package/package06e.hs
index c130df9b86..30bfc20118 100644
--- a/testsuite/tests/package/package06e.hs
+++ b/testsuite/tests/package/package06e.hs
@@ -1,3 +1,3 @@
 module Package06e where
-import GHC.Hs.Types
+import GHC.Hs.Type
 import GHC.Types.Unique.FM
diff --git a/testsuite/tests/package/package06e.stderr b/testsuite/tests/package/package06e.stderr
index db6f8ab508..16b03b49d2 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 ‘GHC.Hs.Types’
+    Could not load module ‘GHC.Hs.Type’
     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 5ab6ff626c..6658eadb38 100644
--- a/testsuite/tests/package/package07e.hs
+++ b/testsuite/tests/package/package07e.hs
@@ -1,5 +1,5 @@
 module Package07e where
 import GHC.Hs.MyTypes
-import GHC.Hs.Types
+import GHC.Hs.Type
 import GHC.Hs.Utils
 import GHC.Types.Unique.FM
diff --git a/testsuite/tests/package/package07e.stderr b/testsuite/tests/package/package07e.stderr
index 8a5c15306f..646ba5a4ed 100644
--- a/testsuite/tests/package/package07e.stderr
+++ b/testsuite/tests/package/package07e.stderr
@@ -2,12 +2,12 @@
 package07e.hs:2:1: error:
     Could not find module ‘GHC.Hs.MyTypes’
     Perhaps you meant
-      GHC.Hs.Types (needs flag -package-id ghc-8.11.0.20200401)
+      GHC.Hs.Type (needs flag -package-id ghc-8.11.0.20200401)
       GHC.Tc.Types (needs flag -package-id ghc-8.11.0.20200401)
     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 ‘GHC.Hs.Types’
+    Could not load module ‘GHC.Hs.Type’
     It is a member of the hidden package ‘ghc-8.11.0.20200401’.
     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 6e547e2dc5..f4d2d2e396 100644
--- a/testsuite/tests/package/package08e.hs
+++ b/testsuite/tests/package/package08e.hs
@@ -1,5 +1,5 @@
 module Package08e where
 import GHC.Hs.MyTypes
-import GHC.Hs.Types
+import GHC.Hs.Type
 import GHC.Hs.Utils
 import GHC.Types.Unique.FM
diff --git a/testsuite/tests/package/package08e.stderr b/testsuite/tests/package/package08e.stderr
index bfb53a3dda..8493fe77a6 100644
--- a/testsuite/tests/package/package08e.stderr
+++ b/testsuite/tests/package/package08e.stderr
@@ -2,12 +2,12 @@
 package08e.hs:2:1: error:
     Could not find module ‘GHC.Hs.MyTypes’
     Perhaps you meant
-      GHC.Hs.Types (needs flag -package-id ghc-8.11.0.20200401)
+      GHC.Hs.Type (needs flag -package-id ghc-8.11.0.20200401)
       GHC.Tc.Types (needs flag -package-id ghc-8.11.0.20200401)
     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 ‘GHC.Hs.Types’
+    Could not load module ‘GHC.Hs.Type’
     It is a member of the hidden package ‘ghc-8.11.0.20200401’.
     You can run ‘:set -package ghc’ to expose it.
     (Note: this unloads all the modules in the current scope.)