Massive bunch of changes to track my massive refactoring to the typechecker

2 files changed, 7 insertions, 4 deletions

diff --git a/testsuite/tests/ghc-regress/module/mod47.stderr b/testsuite/tests/ghc-regress/module/mod47.stderr
index 067bb303af..1b8fd0b411 100644
--- a/testsuite/tests/ghc-regress/module/mod47.stderr
+++ b/testsuite/tests/ghc-regress/module/mod47.stderr
@@ -1,7 +1,9 @@
 
 mod47.hs:6:10:
-    Could not deduce (Num a) from the context (Eq a, Enum a)
+    Could not deduce (Num a)
       arising from the superclasses of an instance declaration
+    from the context (Eq a, Enum a)
+      bound by the instance declaration at mod47.hs:6:10-34
     Possible fix:
       add (Num a) to the context of the instance declaration
     In the instance declaration for `Bar [a]'
diff --git a/testsuite/tests/ghc-regress/module/mod54.stderr b/testsuite/tests/ghc-regress/module/mod54.stderr
index 373ec97439..8b41e7f8bc 100644
--- a/testsuite/tests/ghc-regress/module/mod54.stderr
+++ b/testsuite/tests/ghc-regress/module/mod54.stderr
@@ -2,7 +2,8 @@
 mod54.hs:3:22:
     No instance for (Eq T)
       arising from the 'deriving' clause of a data type declaration
-    Possible fix: add an instance declaration for (Eq T)
-    Alternatively, use a standalone 'deriving instance' declaration,
-      so you can specify the instance context yourself
+    Possible fix:
+      add an instance declaration for (Eq T)
+      or use a standalone 'deriving instance' declaration,
+           so you can specify the instance context yourself
     When deriving the instance for (Ord T)