[commit: testsuite] ghc-7.4: Error message wibbles when fixing Trac #5792 (ef448c8)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : ghc-7.4

http://hackage.haskell.org/trac/ghc/changeset/ef448c8bbbc08ebaf335173c7a15625bef81f678

>---------------------------------------------------------------

commit ef448c8bbbc08ebaf335173c7a15625bef81f678
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Feb 2 13:22:37 2012 +0000

    Error message wibbles when fixing Trac #5792

>---------------------------------------------------------------

 .../indexed-types/should_fail/SimpleFail11a.stderr |    8 ++++----
 .../indexed-types/should_fail/SimpleFail11b.stderr |    8 ++++----
 .../indexed-types/should_fail/SimpleFail11c.stderr |    4 ++--
 .../indexed-types/should_fail/SimpleFail11d.stderr |    4 ++--
 tests/indexed-types/should_fail/T2334.stderr       |    4 ++--
 tests/indexed-types/should_fail/T2677.stderr       |    4 ++--
 tests/indexed-types/should_fail/T4246.stderr       |    4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tests/indexed-types/should_fail/SimpleFail11a.stderr b/tests/indexed-types/should_fail/SimpleFail11a.stderr
index 9af6037..e9615ed 100644
--- a/tests/indexed-types/should_fail/SimpleFail11a.stderr
+++ b/tests/indexed-types/should_fail/SimpleFail11a.stderr
@@ -1,10 +1,10 @@
 
-SimpleFail11a.hs:8:15:
+SimpleFail11a.hs:6:15:
     Conflicting family instance declarations:
-      data instance C9 Int Int -- Defined at SimpleFail11a.hs:8:15
       data instance C9 Int Int -- Defined at SimpleFail11a.hs:6:15
+      data instance C9 Int Int -- Defined at SimpleFail11a.hs:8:15
 
-SimpleFail11a.hs:13:15:
+SimpleFail11a.hs:11:15:
     Conflicting family instance declarations:
-      type instance D9 Int Int -- Defined at SimpleFail11a.hs:13:15
       type instance D9 Int Int -- Defined at SimpleFail11a.hs:11:15
+      type instance D9 Int Int -- Defined at SimpleFail11a.hs:13:15
diff --git a/tests/indexed-types/should_fail/SimpleFail11b.stderr b/tests/indexed-types/should_fail/SimpleFail11b.stderr
index 46eb582..297a18c 100644
--- a/tests/indexed-types/should_fail/SimpleFail11b.stderr
+++ b/tests/indexed-types/should_fail/SimpleFail11b.stderr
@@ -1,10 +1,10 @@
 
-SimpleFail11b.hs:9:15:
+SimpleFail11b.hs:7:15:
     Conflicting family instance declarations:
-      data instance C9 [a] Int -- Defined at SimpleFail11b.hs:9:15
       data instance C9 [a] Int -- Defined at SimpleFail11b.hs:7:15
+      data instance C9 [a] Int -- Defined at SimpleFail11b.hs:9:15
 
-SimpleFail11b.hs:15:15:
+SimpleFail11b.hs:13:15:
     Conflicting family instance declarations:
-      type instance D9 [a] Int -- Defined at SimpleFail11b.hs:15:15
       type instance D9 [a] Int -- Defined at SimpleFail11b.hs:13:15
+      type instance D9 [a] Int -- Defined at SimpleFail11b.hs:15:15
diff --git a/tests/indexed-types/should_fail/SimpleFail11c.stderr b/tests/indexed-types/should_fail/SimpleFail11c.stderr
index 61f1553..3987005 100644
--- a/tests/indexed-types/should_fail/SimpleFail11c.stderr
+++ b/tests/indexed-types/should_fail/SimpleFail11c.stderr
@@ -4,7 +4,7 @@ SimpleFail11c.hs:7:15:
       data instance C9 [a] Int -- Defined at SimpleFail11c.hs:7:15
       data instance C9 [Int] Int -- Defined at SimpleFail11c.hs:9:15
 
-SimpleFail11c.hs:15:15:
+SimpleFail11c.hs:13:15:
     Conflicting family instance declarations:
-      type instance D9 [Int] Int -- Defined at SimpleFail11c.hs:15:15
       type instance D9 [a] Int -- Defined at SimpleFail11c.hs:13:15
+      type instance D9 [Int] Int -- Defined at SimpleFail11c.hs:15:15
diff --git a/tests/indexed-types/should_fail/SimpleFail11d.stderr b/tests/indexed-types/should_fail/SimpleFail11d.stderr
index 0999d49..062d29d 100644
--- a/tests/indexed-types/should_fail/SimpleFail11d.stderr
+++ b/tests/indexed-types/should_fail/SimpleFail11d.stderr
@@ -1,5 +1,5 @@
 
-SimpleFail11d.hs:10:15:
+SimpleFail11d.hs:8:15:
     Conflicting family instance declarations:
-      data instance C9 [a] [Int] -- Defined at SimpleFail11d.hs:10:15
       data instance C9 [Int] [a] -- Defined at SimpleFail11d.hs:8:15
+      data instance C9 [a] [Int] -- Defined at SimpleFail11d.hs:10:15
diff --git a/tests/indexed-types/should_fail/T2334.stderr b/tests/indexed-types/should_fail/T2334.stderr
index 5bb3e24..deceb48 100644
--- a/tests/indexed-types/should_fail/T2334.stderr
+++ b/tests/indexed-types/should_fail/T2334.stderr
@@ -11,7 +11,7 @@ T2334.hs:10:27:
     In the definition of data constructor `H'
     In the newtype instance declaration for `F'
 
-T2334.hs:13:15:
+T2334.hs:12:15:
     Conflicting family instance declarations:
-      data instance F Bool -- Defined at T2334.hs:13:15
       data instance F Bool -- Defined at T2334.hs:12:15
+      data instance F Bool -- Defined at T2334.hs:13:15
diff --git a/tests/indexed-types/should_fail/T2677.stderr b/tests/indexed-types/should_fail/T2677.stderr
index e1c08e3..d160b2a 100644
--- a/tests/indexed-types/should_fail/T2677.stderr
+++ b/tests/indexed-types/should_fail/T2677.stderr
@@ -1,5 +1,5 @@
 
-T2677.hs:7:15:
+T2677.hs:6:15:
     Conflicting family instance declarations:
-      type instance A Int -- Defined at T2677.hs:7:15
       type instance A a -- Defined at T2677.hs:6:15
+      type instance A Int -- Defined at T2677.hs:7:15
diff --git a/tests/indexed-types/should_fail/T4246.stderr b/tests/indexed-types/should_fail/T4246.stderr
index fe1cfce..14bd8ba 100644
--- a/tests/indexed-types/should_fail/T4246.stderr
+++ b/tests/indexed-types/should_fail/T4246.stderr
@@ -4,7 +4,7 @@ T4246.hs:8:9:
       type F a -- Defined at T4246.hs:8:9
       type F Int -- Defined at T4246.hs:11:9
 
-T4246.hs:15:15:
+T4246.hs:14:15:
     Conflicting family instance declarations:
-      type instance G Int -- Defined at T4246.hs:15:15
       type instance G Int -- Defined at T4246.hs:14:15
+      type instance G Int -- Defined at T4246.hs:15:15