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

38 files changed, 47 insertions, 141 deletions

diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hs-boot b/testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hsig
index 75d621cfec..75d621cfec 100644
--- a/testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hs-boot
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hsig
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo005/Makefile b/testsuite/tests/driver/dynamicToo/dynamicToo005/Makefile
index a08827a92d..617510eec4 100644
--- a/testsuite/tests/driver/dynamicToo/dynamicToo005/Makefile
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo005/Makefile
@@ -5,15 +5,11 @@ include $(TOP)/mk/test.mk
 checkExists = [ -f $1 ] || echo $1 missing
 
 .PHONY: dynamicToo005
-# Check that "-c -dynamic-too" works with signatures
+# Check that "-c -dynamic-too" works with .hsig
 dynamicToo005:
 	"$(TEST_HC)" $(TEST_HC_OPTS) -dynamic-too -v0 \
                                -sig-of A005=base:Prelude \
-                               -c A005.hs-boot
-	$(call checkExists,A005.o-boot)
-	$(call checkExists,A005.hi-boot)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -dynamic-too -v0 \
-                               --merge-requirements A005
+                               -c A005.hsig
 	$(call checkExists,A005.o)
 	$(call checkExists,A005.hi)
 	$(call checkExists,A005.dyn_o)
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo006/A.hs-boot b/testsuite/tests/driver/dynamicToo/dynamicToo006/A.hsig
index f79d5d334f..f79d5d334f 100644
--- a/testsuite/tests/driver/dynamicToo/dynamicToo006/A.hs-boot
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo006/A.hsig
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo006/Makefile b/testsuite/tests/driver/dynamicToo/dynamicToo006/Makefile
index 6e025f8322..497f2c0942 100644
--- a/testsuite/tests/driver/dynamicToo/dynamicToo006/Makefile
+++ b/testsuite/tests/driver/dynamicToo/dynamicToo006/Makefile
@@ -11,10 +11,8 @@ dynamicToo006:
                                -sig-of A=base:Prelude \
                                --make B
 	$(call checkExists,A.o)
-	$(call checkExists,A.o-boot)
 	$(call checkExists,B.o)
 	$(call checkExists,A.hi)
-	$(call checkExists,A.hi-boot)
 	$(call checkExists,B.hi)
 	$(call checkExists,A.dyn_o)
 	$(call checkExists,B.dyn_o)
diff --git a/testsuite/tests/driver/recomp014/Makefile b/testsuite/tests/driver/recomp014/Makefile
deleted file mode 100644
index 00b2035206..0000000000
--- a/testsuite/tests/driver/recomp014/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-# -fforce-recomp makes lots of driver tests trivially pass, so we
-# filter it out from $(TEST_HC_OPTS).
-TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS))
-
-# Recompilation tests
-
-clean:
-	rm -f *.o *.hi
-
-recomp014: clean
-	echo 'module A where a = False' > A.hs
-	echo 'module A1 where a = False' > A1.hs
-	echo 'module B where a :: Bool' > B.hs-boot
-	echo 'first run'
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c A.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c A1.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c B.hs-boot -sig-of "B is main:A"
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --merge-requirements B
-	echo 'import B; main = print a' > C.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c C.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c C.hs
-	echo 'second run'
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c B.hs-boot -sig-of "B is main:A1"
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --merge-requirements B
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c C.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) A1.o C.o -o recomp014
-	./recomp014
-
-.PHONY: clean recomp014
diff --git a/testsuite/tests/driver/recomp014/all.T b/testsuite/tests/driver/recomp014/all.T
deleted file mode 100644
index affccd2f7f..0000000000
--- a/testsuite/tests/driver/recomp014/all.T
+++ /dev/null
@@ -1,4 +0,0 @@
-test('recomp014',
-     [ clean_cmd('$MAKE -s clean') ],
-     run_command,
-     ['$MAKE -s --no-print-directory recomp014'])
diff --git a/testsuite/tests/driver/recomp014/recomp014.stdout b/testsuite/tests/driver/recomp014/recomp014.stdout
deleted file mode 100644
index 7d540716f0..0000000000
--- a/testsuite/tests/driver/recomp014/recomp014.stdout
+++ /dev/null
@@ -1,4 +0,0 @@
-first run
-compilation IS NOT required
-second run
-False
diff --git a/testsuite/tests/driver/sigof01/B.hs-boot b/testsuite/tests/driver/sigof01/B.hsig
index 289d3bcb18..289d3bcb18 100644
--- a/testsuite/tests/driver/sigof01/B.hs-boot
+++ b/testsuite/tests/driver/sigof01/B.hsig
diff --git a/testsuite/tests/driver/sigof01/Makefile b/testsuite/tests/driver/sigof01/Makefile
index 8bed672c07..84dfc33a9f 100644
--- a/testsuite/tests/driver/sigof01/Makefile
+++ b/testsuite/tests/driver/sigof01/Makefile
@@ -11,8 +11,7 @@ sigof01:
 	rm -rf tmp_sigof01
 	mkdir tmp_sigof01
 	'$(TEST_HC)' $(S01_OPTS) -c A.hs
-	'$(TEST_HC)' $(S01_OPTS) -c B.hs-boot -sig-of "B is main:A"
-	'$(TEST_HC)' $(S01_OPTS) --merge-requirements B
+	'$(TEST_HC)' $(S01_OPTS) -c B.hsig -sig-of "B is main:A"
 	'$(TEST_HC)' $(S01_OPTS) -c Main.hs
 	'$(TEST_HC)' $(S01_OPTS) tmp_sigof01/A.o tmp_sigof01/Main.o -o tmp_sigof01/Main
 	tmp_sigof01/Main
@@ -22,9 +21,3 @@ sigof01m:
 	mkdir tmp_sigof01m
 	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -outputdir tmp_sigof01m --make Main.hs -sig-of "B is main:A" -o tmp_sigof01m/Main
 	tmp_sigof01m/Main
-
-sigof01i:
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --interactive -v0 -ignore-dot-ghci Main.hs -sig-of "B is main:A" < sigof01i.script
-
-sigof01i2:
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --interactive -v0 -ignore-dot-ghci -sig-of "B is main:A" < sigof01i2.script
diff --git a/testsuite/tests/driver/sigof01/all.T b/testsuite/tests/driver/sigof01/all.T
index 5606127f06..d0cdc3c02c 100644
--- a/testsuite/tests/driver/sigof01/all.T
+++ b/testsuite/tests/driver/sigof01/all.T
@@ -7,13 +7,3 @@ test('sigof01m',
      [ clean_cmd('rm -rf tmp_sigof01m') ],
      run_command,
      ['$MAKE -s --no-print-directory sigof01m'])
-
-test('sigof01i',
-     [],
-     run_command,
-     ['$MAKE -s --no-print-directory sigof01i'])
-
-test('sigof01i2',
-     [],
-     run_command,
-     ['$MAKE -s --no-print-directory sigof01i2'])
diff --git a/testsuite/tests/driver/sigof01/sigof01i.script b/testsuite/tests/driver/sigof01/sigof01i.script
deleted file mode 100644
index ba2906d066..0000000000
--- a/testsuite/tests/driver/sigof01/sigof01i.script
+++ /dev/null
@@ -1 +0,0 @@
-main
diff --git a/testsuite/tests/driver/sigof01/sigof01i.stdout b/testsuite/tests/driver/sigof01/sigof01i.stdout
deleted file mode 100644
index bb614cd2a0..0000000000
--- a/testsuite/tests/driver/sigof01/sigof01i.stdout
+++ /dev/null
@@ -1,3 +0,0 @@
-False
-T
-True
diff --git a/testsuite/tests/driver/sigof01/sigof01i2.script b/testsuite/tests/driver/sigof01/sigof01i2.script
deleted file mode 100644
index 3a91e377a3..0000000000
--- a/testsuite/tests/driver/sigof01/sigof01i2.script
+++ /dev/null
@@ -1,3 +0,0 @@
-:load B
-:browse B
-:issafe
diff --git a/testsuite/tests/driver/sigof01/sigof01i2.stdout b/testsuite/tests/driver/sigof01/sigof01i2.stdout
deleted file mode 100644
index 1ee81c10d2..0000000000
--- a/testsuite/tests/driver/sigof01/sigof01i2.stdout
+++ /dev/null
@@ -1,9 +0,0 @@
-class Foo a where
-  foo :: a -> a
-  {-# MINIMAL foo #-}
-data T = A.T
-mkT :: T
-x :: Bool
-Trust type is (Module: Safe, Package: trusted)
-Package Trust: Off
-B is trusted!
diff --git a/testsuite/tests/driver/sigof01/sigof01m.stdout b/testsuite/tests/driver/sigof01/sigof01m.stdout
index 35190ae143..a7fdd8298e 100644
--- a/testsuite/tests/driver/sigof01/sigof01m.stdout
+++ b/testsuite/tests/driver/sigof01/sigof01m.stdout
@@ -1,7 +1,6 @@
-[1 of 4] Compiling A                ( A.hs, tmp_sigof01m/A.o )
-[2 of 4] Compiling B[boot]          ( B.hs-boot, tmp_sigof01m/B.o-boot )
-[3 of 4] Compiling B[merge]         ( B.hi, tmp_sigof01m/B.o )
-[4 of 4] Compiling Main             ( Main.hs, tmp_sigof01m/Main.o )
+[1 of 3] Compiling A                ( A.hs, tmp_sigof01m/A.o )
+[2 of 3] Compiling B[sig of A]      ( B.hsig, nothing )
+[3 of 3] Compiling Main             ( Main.hs, tmp_sigof01m/Main.o )
 Linking tmp_sigof01m/Main ...
 False
 T
diff --git a/testsuite/tests/driver/sigof02/Makefile b/testsuite/tests/driver/sigof02/Makefile
index aebff03151..8f153f44ce 100644
--- a/testsuite/tests/driver/sigof02/Makefile
+++ b/testsuite/tests/driver/sigof02/Makefile
@@ -11,13 +11,11 @@ sigof02:
 	rm -rf tmp_sigof02
 	mkdir tmp_sigof02
 	'$(GHC_PKG)' field containers key | sed 's/^.*: *//' > tmp_sigof02/containers
-	'$(TEST_HC)' $(S02_OPTS) -c Map.hs-boot -sig-of "Map is `cat tmp_sigof02/containers`:Data.Map.Strict"
-	'$(TEST_HC)' $(S02_OPTS) --merge-requirements Map
+	'$(TEST_HC)' $(S02_OPTS) -c Map.hsig -sig-of "Map is `cat tmp_sigof02/containers`:Data.Map.Strict"
 	'$(TEST_HC)' $(S02_OPTS) -c Main.hs
 	'$(TEST_HC)' $(S02_OPTS) -package containers tmp_sigof02/Main.o -o tmp_sigof02/StrictMain
 	! ./tmp_sigof02/StrictMain
-	'$(TEST_HC)' $(S02_OPTS) -c Map.hs-boot -sig-of "Map is `cat tmp_sigof02/containers`:Data.Map.Lazy"
-	'$(TEST_HC)' $(S02_OPTS) --merge-requirements Map
+	'$(TEST_HC)' $(S02_OPTS) -c Map.hsig -sig-of "Map is `cat tmp_sigof02/containers`:Data.Map.Lazy"
 	'$(TEST_HC)' $(S02_OPTS) -c Main.hs
 	'$(TEST_HC)' $(S02_OPTS) -package containers tmp_sigof02/Main.o -o tmp_sigof02/LazyMain
 	./tmp_sigof02/LazyMain
@@ -26,8 +24,7 @@ S02T_OPTS=$(TEST_HC_OPTS_NO_RECOMP) -fno-code -fwrite-interface -outputdir tmp_s
 sigof02t:
 	rm -rf tmp_sigof02t
 	mkdir tmp_sigof02t
-	'$(TEST_HC)' $(S02T_OPTS) -c Map.hs-boot
-	'$(TEST_HC)' $(S02T_OPTS) --merge-requirements Map
+	'$(TEST_HC)' $(S02T_OPTS) -c Map.hsig
 	'$(TEST_HC)' $(S02T_OPTS) -c Main.hs
 
 S02M_OPTS=$(TEST_HC_OPTS_NO_RECOMP) -outputdir tmp_sigof02m
@@ -50,10 +47,8 @@ sigof02d:
 	rm -rf tmp_sigof02d
 	mkdir tmp_sigof02d
 	'$(GHC_PKG)' field containers key | sed 's/^.*: *//' > tmp_sigof02d/containers
-	'$(TEST_HC)' $(S02D_OPTS) -c Map.hs-boot -sig-of "Map is `cat tmp_sigof02d/containers`:Data.Map.Lazy, MapAsSet is `cat tmp_sigof02d/containers`:Data.Map.Lazy"
-	'$(TEST_HC)' $(S02D_OPTS) --merge-requirements Map
-	'$(TEST_HC)' $(S02D_OPTS) -c MapAsSet.hs-boot -sig-of "Map is `cat tmp_sigof02d/containers`:Data.Map.Lazy, MapAsSet is `cat tmp_sigof02d/containers`:Data.Map.Lazy"
-	'$(TEST_HC)' $(S02D_OPTS) --merge-requirements MapAsSet
+	'$(TEST_HC)' $(S02D_OPTS) -c Map.hsig -sig-of "Map is `cat tmp_sigof02d/containers`:Data.Map.Lazy, MapAsSet is `cat tmp_sigof02d/containers`:Data.Map.Lazy"
+	'$(TEST_HC)' $(S02D_OPTS) -c MapAsSet.hsig -sig-of "Map is `cat tmp_sigof02d/containers`:Data.Map.Lazy, MapAsSet is `cat tmp_sigof02d/containers`:Data.Map.Lazy"
 	'$(TEST_HC)' $(S02D_OPTS) -c Double.hs
 	'$(TEST_HC)' $(S02D_OPTS) -package containers tmp_sigof02d/Main.o -o tmp_sigof02d/Double
 	./tmp_sigof02d/Double
@@ -62,10 +57,8 @@ S02DT_OPTS=$(TEST_HC_OPTS_NO_RECOMP) -outputdir tmp_sigof02dt -i -itmp_sigof02dt
 sigof02dt:
 	rm -rf tmp_sigof02dt
 	mkdir tmp_sigof02dt
-	'$(TEST_HC)' $(S02DT_OPTS) -c Map.hs-boot
-	'$(TEST_HC)' $(S02DT_OPTS) --merge-requirements Map
-	'$(TEST_HC)' $(S02DT_OPTS) -c MapAsSet.hs-boot
-	'$(TEST_HC)' $(S02DT_OPTS) --merge-requirements MapAsSet
+	'$(TEST_HC)' $(S02DT_OPTS) -c Map.hsig
+	'$(TEST_HC)' $(S02DT_OPTS) -c MapAsSet.hsig
 	! '$(TEST_HC)' $(S02DT_OPTS) -c Double.hs
 
 sigof02dm:
diff --git a/testsuite/tests/driver/sigof02/Map.hs-boot b/testsuite/tests/driver/sigof02/Map.hsig
index cd094df17f..cd094df17f 100644
--- a/testsuite/tests/driver/sigof02/Map.hs-boot
+++ b/testsuite/tests/driver/sigof02/Map.hsig
diff --git a/testsuite/tests/driver/sigof02/MapAsSet.hs-boot b/testsuite/tests/driver/sigof02/MapAsSet.hsig
index 1defbc7717..1defbc7717 100644
--- a/testsuite/tests/driver/sigof02/MapAsSet.hs-boot
+++ b/testsuite/tests/driver/sigof02/MapAsSet.hsig
diff --git a/testsuite/tests/driver/sigof02/sigof02dm.stdout b/testsuite/tests/driver/sigof02/sigof02dm.stdout
index a3a5fa8b4b..14ee83789b 100644
--- a/testsuite/tests/driver/sigof02/sigof02dm.stdout
+++ b/testsuite/tests/driver/sigof02/sigof02dm.stdout
@@ -1,8 +1,6 @@
-[1 of 5] Compiling MapAsSet[boot]   ( MapAsSet.hs-boot, tmp_sigof02dm/MapAsSet.o-boot )
-[2 of 5] Compiling MapAsSet[merge]  ( MapAsSet.hi, tmp_sigof02dm/MapAsSet.o )
-[3 of 5] Compiling Map[boot]        ( Map.hs-boot, tmp_sigof02dm/Map.o-boot )
-[4 of 5] Compiling Map[merge]       ( Map.hi, tmp_sigof02dm/Map.o )
-[5 of 5] Compiling Main             ( Double.hs, tmp_sigof02dm/Main.o )
+[1 of 3] Compiling MapAsSet[sig of Data.Map.Lazy] ( MapAsSet.hsig, nothing )
+[2 of 3] Compiling Map[sig of Data.Map.Lazy] ( Map.hsig, nothing )
+[3 of 3] Compiling Main             ( Double.hs, tmp_sigof02dm/Main.o )
 Linking tmp_sigof02dm/Double ...
 False
 fromList [0,6]
diff --git a/testsuite/tests/driver/sigof02/sigof02m.stdout b/testsuite/tests/driver/sigof02/sigof02m.stdout
index 4c80fed188..41cc4a7bb3 100644
--- a/testsuite/tests/driver/sigof02/sigof02m.stdout
+++ b/testsuite/tests/driver/sigof02/sigof02m.stdout
@@ -1,10 +1,8 @@
-[1 of 3] Compiling Map[boot]        ( Map.hs-boot, tmp_sigof02m/Map.o-boot )
-[2 of 3] Compiling Map[merge]       ( Map.hi, tmp_sigof02m/Map.o )
-[3 of 3] Compiling Main             ( Main.hs, tmp_sigof02m/Main.o )
+[1 of 2] Compiling Map[sig of Data.Map.Strict] ( Map.hsig, nothing )
+[2 of 2] Compiling Main             ( Main.hs, tmp_sigof02m/Main.o )
 Linking tmp_sigof02m/StrictMain ...
-[1 of 3] Compiling Map[boot]        ( Map.hs-boot, tmp_sigof02m/Map.o-boot ) [sig-of changed]
-[2 of 3] Compiling Map[merge]       ( Map.hi, tmp_sigof02m/Map.o ) [sig-of changed]
-[3 of 3] Compiling Main             ( Main.hs, tmp_sigof02m/Main.o ) [Map changed]
+[1 of 2] Compiling Map[sig of Data.Map.Lazy] ( Map.hsig, nothing ) [sig-of changed]
+[2 of 2] Compiling Main             ( Main.hs, tmp_sigof02m/Main.o ) [Map changed]
 Linking tmp_sigof02m/LazyMain ...
 False
 [(0,"foo"),(6,"foo")]
diff --git a/testsuite/tests/driver/sigof03/ASig1.hs-boot b/testsuite/tests/driver/sigof03/ASig1.hsig
index 9428e0cf04..9428e0cf04 100644
--- a/testsuite/tests/driver/sigof03/ASig1.hs-boot
+++ b/testsuite/tests/driver/sigof03/ASig1.hsig
diff --git a/testsuite/tests/driver/sigof03/ASig2.hs-boot b/testsuite/tests/driver/sigof03/ASig2.hsig
index 6f278b0a89..6f278b0a89 100644
--- a/testsuite/tests/driver/sigof03/ASig2.hs-boot
+++ b/testsuite/tests/driver/sigof03/ASig2.hsig
diff --git a/testsuite/tests/driver/sigof03/Makefile b/testsuite/tests/driver/sigof03/Makefile
index f39d16ea60..03a0b9b2da 100644
--- a/testsuite/tests/driver/sigof03/Makefile
+++ b/testsuite/tests/driver/sigof03/Makefile
@@ -11,9 +11,8 @@ sigof03:
 	rm -rf tmp_sigof03
 	mkdir tmp_sigof03
 	'$(TEST_HC)' $(S03_OPTS) -c A.hs
-	'$(TEST_HC)' $(S03_OPTS) -c ASig1.hs-boot -sig-of "ASig1 is main:A, ASig2 is main:A"
-	'$(TEST_HC)' $(S03_OPTS) -c ASig2.hs-boot -sig-of "ASig1 is main:A, ASig2 is main:A"
-	'$(TEST_HC)' $(S03_OPTS) --merge-requirements ASig1 ASig2
+	'$(TEST_HC)' $(S03_OPTS) -c ASig1.hsig -sig-of "ASig1 is main:A, ASig2 is main:A"
+	'$(TEST_HC)' $(S03_OPTS) -c ASig2.hsig -sig-of "ASig1 is main:A, ASig2 is main:A"
 	'$(TEST_HC)' $(S03_OPTS) -c Main.hs
 	'$(TEST_HC)' $(S03_OPTS) tmp_sigof03/A.o tmp_sigof03/Main.o -o tmp_sigof03/Main
 	./tmp_sigof03/Main
diff --git a/testsuite/tests/driver/sigof04/Makefile b/testsuite/tests/driver/sigof04/Makefile
index b489174410..f013b0c202 100644
--- a/testsuite/tests/driver/sigof04/Makefile
+++ b/testsuite/tests/driver/sigof04/Makefile
@@ -11,4 +11,4 @@ clean:
 
 sigof04:
 	'$(GHC_PKG)' field containers key | sed 's/^.*: *//' > containers
-	! '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP)  -c Sig.hs-boot -sig-of "Sig is `cat containers`:Data.Map.Strict"
+	! '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP)  -c Sig.hsig -sig-of "Sig is `cat containers`:Data.Map.Strict"
diff --git a/testsuite/tests/driver/sigof04/Sig.hs-boot b/testsuite/tests/driver/sigof04/Sig.hsig
index 3110f28fff..3110f28fff 100644
--- a/testsuite/tests/driver/sigof04/Sig.hs-boot
+++ b/testsuite/tests/driver/sigof04/Sig.hsig
diff --git a/testsuite/tests/driver/sigof04/sigof04.stderr b/testsuite/tests/driver/sigof04/sigof04.stderr
index 2c2e0c39fc..4be1bfd3e5 100644
--- a/testsuite/tests/driver/sigof04/sigof04.stderr
+++ b/testsuite/tests/driver/sigof04/sigof04.stderr
@@ -1,3 +1,3 @@
-
-<no location info>: error:
-    ‘insert’ is exported by the signature file, but not exported by the module
+

+<no location info>:

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

diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index ed0c8e1f19..8acb9a3fe9 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -357,7 +357,7 @@ test('tc262', normal, compile, [''])
 test('tc263',
     extra_clean(['Tc263_Help.o','Tc263_Help.hi']),
     multimod_compile, ['tc263','-v0'])
-test('tc264', normal, multimod_compile, ['tc264.hs-boot', '-sig-of "ShouldCompile is base:Data.STRef"'])
+test('tc264', normal, multimod_compile, ['tc264.hsig', '-sig-of "ShouldCompile is base:Data.STRef"'])
 test('tc265', compile_timeout_multiplier(0.01), compile, [''])
 
 test('GivenOverlapping', normal, compile, [''])
diff --git a/testsuite/tests/typecheck/should_compile/tc264.hs-boot b/testsuite/tests/typecheck/should_compile/tc264.hsig
index 0bfdb2b9f4..0bfdb2b9f4 100644
--- a/testsuite/tests/typecheck/should_compile/tc264.hs-boot
+++ b/testsuite/tests/typecheck/should_compile/tc264.hsig
diff --git a/testsuite/tests/typecheck/should_compile/tc264.stderr b/testsuite/tests/typecheck/should_compile/tc264.stderr
index e3d0e175f8..4eb1124cad 100644
--- a/testsuite/tests/typecheck/should_compile/tc264.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc264.stderr
@@ -1 +1 @@
-[1 of 1] Compiling ShouldCompile[boot] ( tc264.hs-boot, tc264.o )
+[1 of 1] Compiling ShouldCompile[sig of Data.STRef] ( tc264.hsig, nothing )
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