summaryrefslogtreecommitdiff
path: root/testsuite/tests
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2011-09-02 17:44:52 +0100
committerSimon Peyton Jones <simonpj@microsoft.com>2011-09-02 17:44:52 +0100
commitb4b59ca4d2057ee304b6cdbb0a70015689835be6 (patch)
tree54f7ac2084672b3e37c425658934d14a1d02accc /testsuite/tests
parentc5fd25030f85a5058a851ad53c4e887fe832458b (diff)
downloadhaskell-b4b59ca4d2057ee304b6cdbb0a70015689835be6.tar.gz
Error message wibbles
Diffstat (limited to 'testsuite/tests')
-rw-r--r--testsuite/tests/ghci/scripts/T5417.stdout2
-rw-r--r--testsuite/tests/indexed-types/should_fail/Over.stderr20
-rw-r--r--testsuite/tests/typecheck/should_fail/T3468.stderr3
3 files changed, 11 insertions, 14 deletions
diff --git a/testsuite/tests/ghci/scripts/T5417.stdout b/testsuite/tests/ghci/scripts/T5417.stdout
index 1c0506c622..4556d1d765 100644
--- a/testsuite/tests/ghci/scripts/T5417.stdout
+++ b/testsuite/tests/ghci/scripts/T5417.stdout
@@ -3,6 +3,4 @@ data instance C.F (B1 a) = B2 a
data family D a
class C.C1 a where
data family C.F a
-class C.C1 a where
- data family C.F a
-- Defined at T5417a.hs:5:10
diff --git a/testsuite/tests/indexed-types/should_fail/Over.stderr b/testsuite/tests/indexed-types/should_fail/Over.stderr
index 20e2c48897..bb973eee08 100644
--- a/testsuite/tests/indexed-types/should_fail/Over.stderr
+++ b/testsuite/tests/indexed-types/should_fail/Over.stderr
@@ -1,10 +1,10 @@
-
-OverB.hs:7:15:
- Conflicting family instance declarations:
- data instance C [Int] [a] -- Defined at OverB.hs:7:15
- data instance C [a] [Int] -- Defined at OverC.hs:7:15
-
-OverB.hs:9:15:
- Conflicting family instance declarations:
- type instance OverA.D [Int] [a] -- Defined at OverB.hs:9:15
- type instance OverA.D [a] [Int] -- Defined at OverC.hs:9:15
+
+OverB.hs:7:15:
+ Conflicting family instance declarations:
+ data instance OverA.C [Int] [a] -- Defined at OverB.hs:7:15
+ data instance OverA.C [a] [Int] -- Defined at OverC.hs:7:15
+
+OverB.hs:9:15:
+ Conflicting family instance declarations:
+ type instance OverA.D [Int] [a] -- Defined at OverB.hs:9:15
+ type instance OverA.D [a] [Int] -- Defined at OverC.hs:9:15
diff --git a/testsuite/tests/typecheck/should_fail/T3468.stderr b/testsuite/tests/typecheck/should_fail/T3468.stderr
index 020d10457a..45400bc1ea 100644
--- a/testsuite/tests/typecheck/should_fail/T3468.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3468.stderr
@@ -5,7 +5,6 @@ T3468.hs-boot:3:6:
RecFlag Recursive
= F :: forall d a r. a -> Tool d Stricts: _
FamilyInstance: none
- Boot file: data Tool
+ Boot file: abstract(False) Tool
RecFlag NonRecursive
- {- abstract -}
FamilyInstance: none