summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-04-30 11:07:15 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-06-04 04:34:42 -0400
commit32a4ae90b50cc56f2955f489ad0cf8c7ff5e131a (patch)
tree274e86d49420a09eb8400bc3751c55f827ed4e56 /testsuite
parentcb5c31b51b021ce86890bba73276fe6f7405f5d3 (diff)
downloadhaskell-32a4ae90b50cc56f2955f489ad0cf8c7ff5e131a.tar.gz
Clean up boot vs non-boot disambiguating types
We often have (ModuleName, Bool) or (Module, Bool) pairs for "extended" module names (without or with a unit id) disambiguating boot and normal modules. We think this is important enough across the compiler that it deserves a new nominal product type. We do this with synnoyms and a functor named with a `Gen` prefix, matching other newly created definitions. It was also requested that we keep custom `IsBoot` / `NotBoot` sum type. So we have it too. This means changing many the many bools to use that instead. Updates `haddock` submodule.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/parser/should_compile/DumpParsedAst.stderr2
-rw-r--r--testsuite/tests/parser/should_compile/DumpRenamedAst.stderr6
-rw-r--r--testsuite/tests/parser/should_compile/KindSigs.stderr4
-rw-r--r--testsuite/tests/parser/should_compile/T14189.stderr2
-rw-r--r--testsuite/tests/parser/should_run/CountParserDeps.hs2
5 files changed, 7 insertions, 9 deletions
diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
index 7d86febb65..8d597ad371 100644
--- a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
@@ -14,7 +14,7 @@
({ DumpParsedAst.hs:5:8-16 }
{ModuleName: Data.Kind})
(Nothing)
- (False)
+ (NotBoot)
(False)
(NotQualified)
(False)
diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
index 68dc470498..82b2faa84c 100644
--- a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
@@ -648,7 +648,7 @@
({ DumpRenamedAst.hs:4:8-21 }
{ModuleName: Prelude})
(Nothing)
- (False)
+ (NotBoot)
(False)
(NotQualified)
(True)
@@ -661,7 +661,7 @@
({ DumpRenamedAst.hs:5:8-16 }
{ModuleName: Data.Kind})
(Nothing)
- (False)
+ (NotBoot)
(False)
(NotQualified)
(False)
@@ -674,7 +674,7 @@
({ DumpRenamedAst.hs:7:8-16 }
{ModuleName: Data.Kind})
(Nothing)
- (False)
+ (NotBoot)
(False)
(NotQualified)
(False)
diff --git a/testsuite/tests/parser/should_compile/KindSigs.stderr b/testsuite/tests/parser/should_compile/KindSigs.stderr
index 1d6c055436..a23369a65e 100644
--- a/testsuite/tests/parser/should_compile/KindSigs.stderr
+++ b/testsuite/tests/parser/should_compile/KindSigs.stderr
@@ -14,7 +14,7 @@
({ KindSigs.hs:8:8-16 }
{ModuleName: Data.Kind})
(Nothing)
- (False)
+ (NotBoot)
(False)
(NotQualified)
(False)
@@ -608,5 +608,3 @@
[])))]
(Nothing)
(Nothing)))
-
-
diff --git a/testsuite/tests/parser/should_compile/T14189.stderr b/testsuite/tests/parser/should_compile/T14189.stderr
index 29518e5118..fe4d5d861f 100644
--- a/testsuite/tests/parser/should_compile/T14189.stderr
+++ b/testsuite/tests/parser/should_compile/T14189.stderr
@@ -108,7 +108,7 @@
({ T14189.hs:1:8-13 }
{ModuleName: Prelude})
(Nothing)
- (False)
+ (NotBoot)
(False)
(NotQualified)
(True)
diff --git a/testsuite/tests/parser/should_run/CountParserDeps.hs b/testsuite/tests/parser/should_run/CountParserDeps.hs
index fdc44fe09c..1283972828 100644
--- a/testsuite/tests/parser/should_run/CountParserDeps.hs
+++ b/testsuite/tests/parser/should_run/CountParserDeps.hs
@@ -59,4 +59,4 @@ parserDeps libdir =
mkModule = Module (stringToUnit "ghc")
modDeps :: ModIface -> [ModuleName]
- modDeps mi = map fst $ dep_mods (mi_deps mi)
+ modDeps mi = map gwib_mod $ dep_mods (mi_deps mi)