Error message wibbles from out-of-scope changes

The patch "Treat out-of-scope variables as holes" makes
lots of error messages change a bit. This patch has all
the change.

18 files changed, 67 insertions, 63 deletions

diff --git a/testsuite/tests/module/mod101.stderr b/testsuite/tests/module/mod101.stderr
index bb8eecf546..906e1d7ae8 100644
--- a/testsuite/tests/module/mod101.stderr
+++ b/testsuite/tests/module/mod101.stderr
@@ -1,4 +1,4 @@
-
-mod101.hs:8:5:
-    Not in scope: data constructor ‘ConB’
-    Perhaps you meant ‘ConA’ (imported from Mod101_AuxB)
+

+mod101.hs:8:5: error:

+    Data constructor not in scope: ConB :: Bool -> DataA

+    Perhaps you meant ‘ConA’ (imported from Mod101_AuxB)

diff --git a/testsuite/tests/module/mod102.stderr b/testsuite/tests/module/mod102.stderr
index 91aca9f620..4bc979639d 100644
--- a/testsuite/tests/module/mod102.stderr
+++ b/testsuite/tests/module/mod102.stderr
@@ -1,4 +1,4 @@
-
-mod102.hs:8:5:
-    Not in scope: ‘methB’
-    Perhaps you meant ‘methA’ (imported from Mod102_AuxB)
+

+mod102.hs:8:5: error:

+    Variable not in scope: methB :: Bool -> Bool -> ()

+    Perhaps you meant ‘methA’ (imported from Mod102_AuxB)

diff --git a/testsuite/tests/module/mod120.stderr b/testsuite/tests/module/mod120.stderr
index 8c68fa091c..0052dcc79a 100644
--- a/testsuite/tests/module/mod120.stderr
+++ b/testsuite/tests/module/mod120.stderr
@@ -1,2 +1,2 @@
-
-mod120.hs:5:5: Not in scope: data constructor ‘Foo’
+

+mod120.hs:5:5: error: Data constructor not in scope: Foo

diff --git a/testsuite/tests/module/mod121.stderr b/testsuite/tests/module/mod121.stderr
index 7036ddb935..aa0a8cd4af 100644
--- a/testsuite/tests/module/mod121.stderr
+++ b/testsuite/tests/module/mod121.stderr
@@ -1,4 +1,4 @@
-
-mod121.hs:5:5:
-    Not in scope: ‘m2’
-    Perhaps you meant ‘m1’ (imported from Mod121_A)
+

+mod121.hs:5:5: error:

+    Variable not in scope: m2 :: Int -> t

+    Perhaps you meant ‘m1’ (imported from Mod121_A)

diff --git a/testsuite/tests/module/mod125.stderr b/testsuite/tests/module/mod125.stderr
index 1d56d076af..18482dd81a 100644
--- a/testsuite/tests/module/mod125.stderr
+++ b/testsuite/tests/module/mod125.stderr
@@ -1,2 +1,2 @@
-
-mod125.hs:7:5: Not in scope: data constructor ‘T’
+

+mod125.hs:7:5: error: Data constructor not in scope: T

diff --git a/testsuite/tests/module/mod126.stderr b/testsuite/tests/module/mod126.stderr
index 26d26330be..dd417b5eb5 100644
--- a/testsuite/tests/module/mod126.stderr
+++ b/testsuite/tests/module/mod126.stderr
@@ -1,2 +1,2 @@
-
-mod126.hs:7:5: Not in scope: data constructor ‘T’
+

+mod126.hs:7:5: error: Data constructor not in scope: T

diff --git a/testsuite/tests/module/mod130.stderr b/testsuite/tests/module/mod130.stderr
index 87fb842e7a..33690756f1 100644
--- a/testsuite/tests/module/mod130.stderr
+++ b/testsuite/tests/module/mod130.stderr
@@ -1,2 +1,3 @@
-
-mod130.hs:7:5: Not in scope: ‘<’
+

+mod130.hs:7:5: error:

+    Variable not in scope: (<) :: Integer -> Int -> Int

diff --git a/testsuite/tests/module/mod132.stderr b/testsuite/tests/module/mod132.stderr
index 0a9d25cda8..3547563a06 100644
--- a/testsuite/tests/module/mod132.stderr
+++ b/testsuite/tests/module/mod132.stderr
@@ -1,4 +1,4 @@
-
-mod132.hs:6:7:
-    Not in scope: data constructor ‘Foo’
-    Perhaps you meant variable ‘foo’ (line 6)
+

+mod132.hs:6:7: error:

+    Data constructor not in scope: Foo

+    Perhaps you meant variable ‘foo’ (line 6)

diff --git a/testsuite/tests/module/mod136.stderr b/testsuite/tests/module/mod136.stderr
index 58dab52093..9726cc3cff 100644
--- a/testsuite/tests/module/mod136.stderr
+++ b/testsuite/tests/module/mod136.stderr
@@ -1,6 +1,6 @@
-
-mod136.hs:6:5:
-    Not in scope: ‘zipWith5’
-    Perhaps you meant one of these:
-      ‘zipWith’ (imported from Mod136_A),
-      ‘zipWith3’ (imported from Mod136_A)
+

+mod136.hs:6:5: error:

+    Variable not in scope: zipWith5

+    Perhaps you meant one of these:

+      ‘zipWith’ (imported from Mod136_A),

+      ‘zipWith3’ (imported from Mod136_A)

diff --git a/testsuite/tests/module/mod138.stderr b/testsuite/tests/module/mod138.stderr
index 7886bcdde5..4c24e4063b 100644
--- a/testsuite/tests/module/mod138.stderr
+++ b/testsuite/tests/module/mod138.stderr
@@ -1,2 +1,2 @@
-
-mod138.hs:7:5: Not in scope: ‘isLatin1’
+

+mod138.hs:7:5: error: Variable not in scope: isLatin1

diff --git a/testsuite/tests/module/mod147.stderr b/testsuite/tests/module/mod147.stderr
index ce7101c077..335dbd2211 100644
--- a/testsuite/tests/module/mod147.stderr
+++ b/testsuite/tests/module/mod147.stderr
@@ -1,2 +1,3 @@
-
-mod147.hs:6:5: Not in scope: data constructor ‘D’
+

+mod147.hs:6:5: error:

+    Data constructor not in scope: D :: Integer -> t

diff --git a/testsuite/tests/module/mod158.stderr b/testsuite/tests/module/mod158.stderr
index 4fcc0a0365..afe0deb7ba 100644
--- a/testsuite/tests/module/mod158.stderr
+++ b/testsuite/tests/module/mod158.stderr
@@ -1,3 +1,3 @@
-
-mod158.hs:12:5: Not in scope: data constructor ‘C’
-exit(1)
+

+mod158.hs:12:5: error: Data constructor not in scope: C

+exit(1)

diff --git a/testsuite/tests/module/mod160.stderr b/testsuite/tests/module/mod160.stderr
index 7c752de093..a4b8669de8 100644
--- a/testsuite/tests/module/mod160.stderr
+++ b/testsuite/tests/module/mod160.stderr
@@ -1,6 +1,6 @@
-
-mod160.hs:12:5:
-    Not in scope: ‘m3’
-    Perhaps you meant one of these:
-      ‘m1’ (imported from Mod159_D), ‘m2’ (imported from Mod159_D)
-exit(1)
+

+mod160.hs:12:5: error:

+    Variable not in scope: m3 :: Char -> t

+    Perhaps you meant one of these:

+      ‘m1’ (imported from Mod159_D), ‘m2’ (imported from Mod159_D)

+exit(1)

diff --git a/testsuite/tests/module/mod36.stderr b/testsuite/tests/module/mod36.stderr
index 28ed1cdaae..ded22d6eb4 100644
--- a/testsuite/tests/module/mod36.stderr
+++ b/testsuite/tests/module/mod36.stderr
@@ -1,2 +1,2 @@
-
-mod36.hs:5:5: Not in scope: ‘const’
+

+mod36.hs:5:5: error: Variable not in scope: const

diff --git a/testsuite/tests/module/mod71.stderr b/testsuite/tests/module/mod71.stderr
index 53d697e133..84a5c865b6 100644
--- a/testsuite/tests/module/mod71.stderr
+++ b/testsuite/tests/module/mod71.stderr
@@ -1,12 +1,12 @@
-
-mod71.hs:4:9: error:
-    Found hole ‘_’ with type: t1
-    Where: ‘t1’ is a rigid type variable bound by
-                the inferred type of f :: Num a => (t1 -> a -> t) -> t
-                at mod71.hs:4:1
-    Relevant bindings include
-      x :: t1 -> a -> t (bound at mod71.hs:4:3)
-      f :: (t1 -> a -> t) -> t (bound at mod71.hs:4:1)
-    In the first argument of ‘x’, namely ‘_’
-    In the expression: x _ 1
-    In an equation for ‘f’: f x = x _ 1
+

+mod71.hs:4:9: error:

+    Found hole: _ :: t1

+    Where: ‘t1’ is a rigid type variable bound by

+                the inferred type of f :: Num a => (t1 -> a -> t) -> t

+                at mod71.hs:4:1

+    Relevant bindings include

+      x :: t1 -> a -> t (bound at mod71.hs:4:3)

+      f :: (t1 -> a -> t) -> t (bound at mod71.hs:4:1)

+    In the first argument of ‘x’, namely ‘_’

+    In the expression: x _ 1

+    In an equation for ‘f’: f x = x _ 1

diff --git a/testsuite/tests/module/mod72.stderr b/testsuite/tests/module/mod72.stderr
index 5726922feb..8af25f6012 100644
--- a/testsuite/tests/module/mod72.stderr
+++ b/testsuite/tests/module/mod72.stderr
@@ -1,2 +1,2 @@
-
-mod72.hs:3:7: Not in scope: ‘g’
+

+mod72.hs:3:7: error: Variable not in scope: g :: t1 -> t

diff --git a/testsuite/tests/module/mod87.stderr b/testsuite/tests/module/mod87.stderr
index fdb9c84ccb..dc6c5151ec 100644
--- a/testsuite/tests/module/mod87.stderr
+++ b/testsuite/tests/module/mod87.stderr
@@ -1,2 +1,3 @@
-
-mod87.hs:4:5: Not in scope: data constructor ‘Left’
+

+mod87.hs:4:5: error:

+    Data constructor not in scope: Left :: Char -> t

diff --git a/testsuite/tests/module/mod97.stderr b/testsuite/tests/module/mod97.stderr
index 23e129702e..261df0eff2 100644
--- a/testsuite/tests/module/mod97.stderr
+++ b/testsuite/tests/module/mod97.stderr
@@ -1,2 +1,3 @@
-
-mod97.hs:4:9: Not in scope: ‘==’
+

+mod97.hs:4:9: error:

+    Variable not in scope: (==) :: Char -> Char -> t