summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2012-02-06 08:43:52 +0000
committerSimon Peyton Jones <simonpj@microsoft.com>2012-02-06 08:43:52 +0000
commit9e59ec25a830ba757e38d130130172669b0dfe7a (patch)
treeeb24a37bb8b7639fe62bfab0218b333a5058fa28
parent5c1862771c0486d0429e4768e90dd2bc43d6a717 (diff)
downloadhaskell-9e59ec25a830ba757e38d130130172669b0dfe7a.tar.gz
Minor wibbles in error message ordering
-rw-r--r--testsuite/tests/indexed-types/should_fail/SimpleFail11a.stderr8
-rw-r--r--testsuite/tests/indexed-types/should_fail/SimpleFail11b.stderr8
-rw-r--r--testsuite/tests/indexed-types/should_fail/SimpleFail11c.stderr4
-rw-r--r--testsuite/tests/indexed-types/should_fail/SimpleFail11d.stderr4
-rw-r--r--testsuite/tests/indexed-types/should_fail/T2334.stderr4
-rw-r--r--testsuite/tests/indexed-types/should_fail/T2677.stderr4
-rw-r--r--testsuite/tests/indexed-types/should_fail/T4246.stderr4
7 files changed, 18 insertions, 18 deletions
diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail11a.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail11a.stderr
index 9af6037bbe..e9615eddc3 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail11a.stderr
+++ b/testsuite/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/testsuite/tests/indexed-types/should_fail/SimpleFail11b.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail11b.stderr
index 46eb582aeb..297a18c5d5 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail11b.stderr
+++ b/testsuite/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/testsuite/tests/indexed-types/should_fail/SimpleFail11c.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail11c.stderr
index 61f1553fcf..39870055e5 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail11c.stderr
+++ b/testsuite/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/testsuite/tests/indexed-types/should_fail/SimpleFail11d.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail11d.stderr
index 0999d49fae..062d29d8f2 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail11d.stderr
+++ b/testsuite/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/testsuite/tests/indexed-types/should_fail/T2334.stderr b/testsuite/tests/indexed-types/should_fail/T2334.stderr
index 5bb3e24c22..deceb48755 100644
--- a/testsuite/tests/indexed-types/should_fail/T2334.stderr
+++ b/testsuite/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/testsuite/tests/indexed-types/should_fail/T2677.stderr b/testsuite/tests/indexed-types/should_fail/T2677.stderr
index e1c08e3b15..d160b2a89c 100644
--- a/testsuite/tests/indexed-types/should_fail/T2677.stderr
+++ b/testsuite/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/testsuite/tests/indexed-types/should_fail/T4246.stderr b/testsuite/tests/indexed-types/should_fail/T4246.stderr
index fe1cfce250..14bd8ba407 100644
--- a/testsuite/tests/indexed-types/should_fail/T4246.stderr
+++ b/testsuite/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