Revert "Unify hsig and hs-boot; add preliminary "hs-boot" merging."

Summary:
This reverts commit 06d46b1e4507e09eb2a7a04998a92610c8dc6277.

This also has a Haddock submodule update.

Test Plan: validate

Reviewers: simonpj, austin, bgamari

Subscribers: thomie

Differential Revision: https://phabricator.haskell.org/D1475

9 files changed, 19 insertions, 20 deletions

diff --git a/testsuite/tests/typecheck/should_fail/all.T b/testsuite/tests/typecheck/should_fail/all.T
index c2ec10526f..9f0434e1ae 100644
--- a/testsuite/tests/typecheck/should_fail/all.T
+++ b/testsuite/tests/typecheck/should_fail/all.T
@@ -242,10 +242,10 @@ test('tcfail215', normal, compile_fail, [''])
 test('tcfail216', normal, compile_fail, [''])
 test('tcfail217', normal, compile_fail, [''])
 test('tcfail218', normal, compile_fail, [''])
-test('tcfail219', normal, multimod_compile_fail, ['tcfail219.hs-boot', '-sig-of "ShouldFail is base:Data.Bool"'])
-test('tcfail220', normal, multimod_compile_fail, ['tcfail220.hs-boot', '-sig-of "ShouldFail is base:Prelude"'])
-test('tcfail221', normal, multimod_compile_fail, ['tcfail221.hs-boot', '-sig-of "ShouldFail is base:Prelude"'])
-test('tcfail222', normal, multimod_compile_fail, ['tcfail222.hs-boot', '-sig-of "ShouldFail is base:Data.STRef"'])
+test('tcfail219', normal, multimod_compile_fail, ['tcfail219.hsig', '-sig-of "ShouldFail is base:Data.Bool"'])
+test('tcfail220', normal, multimod_compile_fail, ['tcfail220.hsig', '-sig-of "ShouldFail is base:Prelude"'])
+test('tcfail221', normal, multimod_compile_fail, ['tcfail221.hsig', '-sig-of "ShouldFail is base:Prelude"'])
+test('tcfail222', normal, multimod_compile_fail, ['tcfail222.hsig', '-sig-of "ShouldFail is base:Data.STRef"'])
 test('tcfail223', normal, compile_fail, [''])
 
 test('SilentParametersOverlapping', normal, compile, [''])
diff --git a/testsuite/tests/typecheck/should_fail/tcfail219.hs-boot b/testsuite/tests/typecheck/should_fail/tcfail219.hsig
index ec6d6076ab..ec6d6076ab 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail219.hs-boot
+++ b/testsuite/tests/typecheck/should_fail/tcfail219.hsig
diff --git a/testsuite/tests/typecheck/should_fail/tcfail219.stderr b/testsuite/tests/typecheck/should_fail/tcfail219.stderr
index d364137c08..53a7edebe0 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail219.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail219.stderr
@@ -1,4 +1,3 @@
-[1 of 1] Compiling ShouldFail[boot] ( tcfail219.hs-boot, tcfail219.o )
+[1 of 1] Compiling ShouldFail[sig of Data.Bool] ( tcfail219.hsig, nothing )
 
-tcfail219.hs-boot:1:1: error:
-    Not in scope: type constructor or class ‘Booly’
+tcfail219.hsig:1:1: Not in scope: type constructor or class ‘Booly’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail220.hs-boot b/testsuite/tests/typecheck/should_fail/tcfail220.hsig
index c9e80e3da2..c9e80e3da2 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail220.hs-boot
+++ b/testsuite/tests/typecheck/should_fail/tcfail220.hsig
diff --git a/testsuite/tests/typecheck/should_fail/tcfail220.stderr b/testsuite/tests/typecheck/should_fail/tcfail220.stderr
index e8d3c810ff..d78fa6d83e 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail220.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail220.stderr
@@ -1,9 +1,9 @@
-[1 of 1] Compiling ShouldFail[boot] ( tcfail220.hs-boot, tcfail220.o )
+[1 of 1] Compiling ShouldFail[sig of Prelude] ( tcfail220.hsig, nothing )
 
-tcfail220.hs-boot:4:1: error:
+tcfail220.hsig:4:1: error:
     Type constructor ‘Either’ has conflicting definitions in the module
-    and its signature file
+    and its hsig file
     Main module: data Either a b = Left a | Right b
-    Signature file:  type role Either representational phantom phantom
-                     data Either a b c = Left a
+    Hsig file:  type role Either representational phantom phantom
+                data Either a b c = Left a
     The types have different kinds
diff --git a/testsuite/tests/typecheck/should_fail/tcfail221.hs-boot b/testsuite/tests/typecheck/should_fail/tcfail221.hsig
index a60c1a0d80..a60c1a0d80 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail221.hs-boot
+++ b/testsuite/tests/typecheck/should_fail/tcfail221.hsig
diff --git a/testsuite/tests/typecheck/should_fail/tcfail221.stderr b/testsuite/tests/typecheck/should_fail/tcfail221.stderr
index aef6c81a79..8781bd056e 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail221.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail221.stderr
@@ -1,6 +1,6 @@
-[1 of 1] Compiling ShouldFail[boot] ( tcfail221.hs-boot, tcfail221.o )
+[1 of 1] Compiling ShouldFail[sig of Prelude] ( tcfail221.hsig, nothing )
 
-tcfail221.hs-boot:2:10: error:
+tcfail221.hsig:2:10:
     Duplicate instance declarations:
-      instance Show Int -- Defined at tcfail221.hs-boot:2:10
-      instance Show Int -- Defined at tcfail221.hs-boot:3:10
+      instance Show Int -- Defined at tcfail221.hsig:2:10
+      instance Show Int -- Defined at tcfail221.hsig:3:10
diff --git a/testsuite/tests/typecheck/should_fail/tcfail222.hs-boot b/testsuite/tests/typecheck/should_fail/tcfail222.hsig
index e83f4e3b83..e83f4e3b83 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail222.hs-boot
+++ b/testsuite/tests/typecheck/should_fail/tcfail222.hsig
diff --git a/testsuite/tests/typecheck/should_fail/tcfail222.stderr b/testsuite/tests/typecheck/should_fail/tcfail222.stderr
index 3f1466fede..1293b787a0 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail222.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail222.stderr
@@ -1,4 +1,4 @@
-[1 of 1] Compiling ShouldFail[boot] ( tcfail222.hs-boot, tcfail222.o )
-
-<no location info>: error:
-    ‘newSTRef’ is exported by the signature file, but not exported by the module
+[1 of 1] Compiling ShouldFail[sig of Data.STRef] ( tcfail222.hsig, nothing )

+

+<no location info>:

+    ‘newSTRef’ is exported by the hsig file, but not exported by the module