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

On branch : master

http://hackage.haskell.org/trac/ghc/changeset/0199237eac060c8d5598bb5e083e34a64d9d6813

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

commit 0199237eac060c8d5598bb5e083e34a64d9d6813
Author: Ian Lynagh <igloo@xxxxxxxx>
Date: Wed Feb 22 01:48:11 2012 +0000

Update output for rnfail055 again

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

tests/rename/should_fail/rnfail055.stderr | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/tests/rename/should_fail/rnfail055.stderr
b/tests/rename/should_fail/rnfail055.stderr
index 64fe7e9..56e6086 100644
--- a/tests/rename/should_fail/rnfail055.stderr
+++ b/tests/rename/should_fail/rnfail055.stderr
@@ -12,21 +12,13 @@ RnFail055.hs-boot:4:1:

RnFail055.hs-boot:6:6:
Type constructor `S1' has conflicting definitions in the module and its
hs-boot file
- Main module: type S1 a b
- No C type associated
- = (a, b)
- Boot file: type S1 a b c
- No C type associated
- = (a, b)
+ Main module: type S1 a b = (a, b)
+ Boot file: type S1 a b c = (a, b)

RnFail055.hs-boot:8:6:
Type constructor `S2' has conflicting definitions in the module and its
hs-boot file
- Main module: type S2 a b
- No C type associated
- = forall a. (a, b)
- Boot file: type S2 a b
- No C type associated
- = forall b. (a, b)
+ Main module: type S2 a b = forall a. (a, b)
+ Boot file: type S2 a b = forall b. (a, b)

RnFail055.hs-boot:12:6:
Type constructor `T1' has conflicting definitions in the module and its
hs-boot file



_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@xxxxxxxxxxx
http://www.haskell.org/mailman/listinfo/cvs-ghc