Lots of error message wibbling, following the

major TcErrors refactoring

7 files changed, 20 insertions, 18 deletions

diff --git a/testsuite/tests/ghci.debugger/scripts/break003.stderr b/testsuite/tests/ghci.debugger/scripts/break003.stderr
index f5944094e7..58f1b68f78 100644
--- a/testsuite/tests/ghci.debugger/scripts/break003.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/break003.stderr
@@ -2,5 +2,7 @@
 <interactive>:5:1:
     No instance for (Show (t -> a))
       arising from a use of `print'
+    Cannot resolve unknown runtime types `t', `a'
+    Use :print or :force to determine these types
     Possible fix: add an instance declaration for (Show (t -> a))
     In a stmt of an interactive GHCi command: print it
diff --git a/testsuite/tests/ghci.debugger/scripts/break006.stderr b/testsuite/tests/ghci.debugger/scripts/break006.stderr
index 40bb7861e0..7ee08988ab 100644
--- a/testsuite/tests/ghci.debugger/scripts/break006.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/break006.stderr
@@ -1,14 +1,14 @@
 
 <interactive>:6:1:
-    Ambiguous type variable `a' in the constraint:
-      (Show a) arising from a use of `print'
-    Cannot resolve unknown runtime types: a
+    No instance for (Show a)
+      arising from a use of `print'
+    Cannot resolve unknown runtime type `a'
     Use :print or :force to determine these types
     In a stmt of an interactive GHCi command: print it
 
 <interactive>:8:1:
-    Ambiguous type variable `a' in the constraint:
-      (Show a) arising from a use of `print'
-    Cannot resolve unknown runtime types: a
+    No instance for (Show a)
+      arising from a use of `print'
+    Cannot resolve unknown runtime type `a'
     Use :print or :force to determine these types
     In a stmt of an interactive GHCi command: print it
diff --git a/testsuite/tests/ghci.debugger/scripts/break018.stderr b/testsuite/tests/ghci.debugger/scripts/break018.stderr
index 0107b5880f..d0bb1e0d0a 100644
--- a/testsuite/tests/ghci.debugger/scripts/break018.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/break018.stderr
@@ -1,3 +1,3 @@
-

-<no location info>:

-    Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead

+
+<no location info>: Warning:
+    -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
diff --git a/testsuite/tests/ghci.debugger/scripts/dynbrk004.stderr b/testsuite/tests/ghci.debugger/scripts/dynbrk004.stderr
index 0107b5880f..d0bb1e0d0a 100644
--- a/testsuite/tests/ghci.debugger/scripts/dynbrk004.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk004.stderr
@@ -1,3 +1,3 @@
-

-<no location info>:

-    Warning: -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead

+
+<no location info>: Warning:
+    -XRecursiveDo is deprecated: use -XDoRec or pragma {-# LANGUAGE DoRec #-} instead
diff --git a/testsuite/tests/ghci.debugger/scripts/print006.stdout b/testsuite/tests/ghci.debugger/scripts/print006.stdout
index 1cf7de8a8e..72a0328b2f 100644
--- a/testsuite/tests/ghci.debugger/scripts/print006.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print006.stdout
@@ -2,7 +2,7 @@ t = O (_t1::a)
 ()
 t = O ((_t2::a1) : (_t3::[a1]))
 ()
-t = O ((_t4::a2) : (_t5::a2) : (_t6::[a2]))
+t = O ((_t4::a1) : (_t5::a1) : (_t6::[a1]))
 ()
 t = O ((_t7::Maybe [Integer]) : Just [2,2] :
        (_t8::[Maybe [Integer]]))
diff --git a/testsuite/tests/ghci.debugger/scripts/print007.stderr b/testsuite/tests/ghci.debugger/scripts/print007.stderr
index 713c629818..d298a59365 100644
--- a/testsuite/tests/ghci.debugger/scripts/print007.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/print007.stderr
@@ -1,3 +1,3 @@
 
-<no location info>:
-    Warning: -O conflicts with --interactive; -O ignored.
+<no location info>: Warning:
+    -O conflicts with --interactive; -O ignored.
diff --git a/testsuite/tests/ghci.debugger/scripts/print019.stderr b/testsuite/tests/ghci.debugger/scripts/print019.stderr
index 5cc34662fe..e272ce9e1f 100644
--- a/testsuite/tests/ghci.debugger/scripts/print019.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/print019.stderr
@@ -1,7 +1,7 @@
 
 <interactive>:11:1:
-    Ambiguous type variable `a1' in the constraint:
-      (Show a1) arising from a use of `print'
-    Cannot resolve unknown runtime types: a1
+    No instance for (Show a1)
+      arising from a use of `print'
+    Cannot resolve unknown runtime type `a1'
     Use :print or :force to determine these types
     In a stmt of an interactive GHCi command: print it