From b3e382c4e034993f8e0e39742207fae881c18236 Mon Sep 17 00:00:00 2001
From: Krzysztof Gogolewski
Date: Fri, 19 Apr 2013 13:25:58 +0200
Subject: [PATCH] Fix tests after #7848
---
tests/generics/GenDerivOutput.stderr | 16 ++++++-------
tests/generics/GenDerivOutput1_0.stderr | 4 ++--
tests/generics/GenDerivOutput1_1.stderr | 32 +++++++++++++-------------
tests/typecheck/should_fail/T2688.stderr | 2 +-
tests/typecheck/should_fail/T7734.stderr | 2 +-
tests/typecheck/should_fail/tcfail021.stderr | 2 +-
6 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/tests/generics/GenDerivOutput.stderr b/tests/generics/GenDerivOutput.stderr
index 041208f..b47b3f3 100644
--- a/tests/generics/GenDerivOutput.stderr
+++ b/tests/generics/GenDerivOutput.stderr
@@ -16,8 +16,8 @@ Derived instances:
(GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
= GenDerivOutput.Nil
GHC.Generics.to
- (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 (GHC.Generics.K1 g1))
- (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
+ (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 (GHC.Generics.K1 g1))
+ (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
= GenDerivOutput.Cons g1 g2
instance GHC.Generics.Generic1 GenDerivOutput.List where
@@ -35,8 +35,8 @@ Derived instances:
(GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
= GenDerivOutput.Nil
GHC.Generics.to1
- (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 g1)
- (GHC.Generics.M1 g2)))))
+ (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 g1)
+ (GHC.Generics.M1 g2)))))
= GenDerivOutput.Cons
(GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2)
@@ -60,8 +60,8 @@ Derived instances:
(GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
= GenDerivOutput.Empty
GHC.Generics.to
- (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 (GHC.Generics.K1 g1))
- (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
+ (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 (GHC.Generics.K1 g1))
+ (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
= GenDerivOutput.Rose g1 g2
instance GHC.Generics.Generic1 GenDerivOutput.Rose where
@@ -81,8 +81,8 @@ Derived instances:
(GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
= GenDerivOutput.Empty
GHC.Generics.to1
- (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 g1)
- (GHC.Generics.M1 g2)))))
+ (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 g1)
+ (GHC.Generics.M1 g2)))))
= GenDerivOutput.Rose
(GHC.Generics.unPar1 g1)
((GHC.Base..)
diff --git a/tests/generics/GenDerivOutput1_0.stderr b/tests/generics/GenDerivOutput1_0.stderr
index e782b6e..222d2d3 100644
--- a/tests/generics/GenDerivOutput1_0.stderr
+++ b/tests/generics/GenDerivOutput1_0.stderr
@@ -16,8 +16,8 @@ Derived instances:
(GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
= GenDerivOutput1_0.Nil
GHC.Generics.to1
- (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 g1)
- (GHC.Generics.M1 g2)))))
+ (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 g1)
+ (GHC.Generics.M1 g2)))))
= GenDerivOutput1_0.Cons
(GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2)
diff --git a/tests/generics/GenDerivOutput1_1.stderr b/tests/generics/GenDerivOutput1_1.stderr
index ff6d257..6b9f546 100644
--- a/tests/generics/GenDerivOutput1_1.stderr
+++ b/tests/generics/GenDerivOutput1_1.stderr
@@ -16,8 +16,8 @@ Derived instances:
(GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
= CanDoRep1_1.D0d
GHC.Generics.to1
- (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 g1)
- (GHC.Generics.M1 g2)))))
+ (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 g1)
+ (GHC.Generics.M1 g2)))))
= CanDoRep1_1.D1d (GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2)
instance GHC.Generics.Generic (CanDoRep1_1.Dd a) where
@@ -35,8 +35,8 @@ Derived instances:
(GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
= CanDoRep1_1.D0d
GHC.Generics.to
- (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 (GHC.Generics.K1 g1))
- (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
+ (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 (GHC.Generics.K1 g1))
+ (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
= CanDoRep1_1.D1d g1 g2
instance GHC.Generics.Generic (CanDoRep1_1.Dc a) where
@@ -54,8 +54,8 @@ Derived instances:
(GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
= CanDoRep1_1.D0c
GHC.Generics.to
- (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 (GHC.Generics.K1 g1))
- (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
+ (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 (GHC.Generics.K1 g1))
+ (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
= CanDoRep1_1.D1c g1 g2
instance GHC.Generics.Generic1 CanDoRep1_1.Db where
@@ -73,8 +73,8 @@ Derived instances:
(GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
= CanDoRep1_1.D0b
GHC.Generics.to1
- (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 g1)
- (GHC.Generics.M1 g2)))))
+ (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 g1)
+ (GHC.Generics.M1 g2)))))
= CanDoRep1_1.D1b (GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2)
instance GHC.Generics.Generic (CanDoRep1_1.Da a) where
@@ -92,8 +92,8 @@ Derived instances:
(GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
= CanDoRep1_1.D0
GHC.Generics.to
- (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 (GHC.Generics.K1 g1))
- (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
+ (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 (GHC.Generics.K1 g1))
+ (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
= CanDoRep1_1.D1 g1 g2
instance GHC.Generics.Generic1 CanDoRep1_1.Da where
@@ -111,8 +111,8 @@ Derived instances:
(GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
= CanDoRep1_1.D0
GHC.Generics.to1
- (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 g1)
- (GHC.Generics.M1 g2)))))
+ (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 g1)
+ (GHC.Generics.M1 g2)))))
= CanDoRep1_1.D1 (GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2)
instance GHC.Generics.Generic (CanDoRep1_1.Db a) where
@@ -130,8 +130,8 @@ Derived instances:
(GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
= CanDoRep1_1.D0b
GHC.Generics.to
- (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 (GHC.Generics.K1 g1))
- (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
+ (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 (GHC.Generics.K1 g1))
+ (GHC.Generics.M1 (GHC.Generics.K1 g2))))))
= CanDoRep1_1.D1b g1 g2
instance GHC.Generics.Generic1 CanDoRep1_1.Dc where
@@ -149,8 +149,8 @@ Derived instances:
(GHC.Generics.M1 (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)))
= CanDoRep1_1.D0c
GHC.Generics.to1
- (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 (GHC.Generics.:*: (GHC.Generics.M1 g1)
- (GHC.Generics.M1 g2)))))
+ (GHC.Generics.M1 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 g1)
+ (GHC.Generics.M1 g2)))))
= CanDoRep1_1.D1c (GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2)
instance GHC.Generics.Datatype CanDoRep1_1.D1Da where
diff --git a/tests/typecheck/should_fail/T2688.stderr b/tests/typecheck/should_fail/T2688.stderr
index bbc415a..e4fef7d 100644
--- a/tests/typecheck/should_fail/T2688.stderr
+++ b/tests/typecheck/should_fail/T2688.stderr
@@ -9,7 +9,7 @@ T2688.hs:8:22:
‛v’ is a rigid type variable bound by
the class declaration for ‛VectorSpace’ at T2688.hs:5:19
Relevant bindings include
- ^/ :: v -> s -> v (bound at T2688.hs:8:5)
+ (^/) :: v -> s -> v (bound at T2688.hs:8:5)
v :: v (bound at T2688.hs:8:5)
s :: s (bound at T2688.hs:8:10)
In the second argument of ‛(/)’, namely ‛s’
diff --git a/tests/typecheck/should_fail/T7734.stderr b/tests/typecheck/should_fail/T7734.stderr
index d90d136..539de1e 100644
--- a/tests/typecheck/should_fail/T7734.stderr
+++ b/tests/typecheck/should_fail/T7734.stderr
@@ -11,7 +11,7 @@ T7734.hs:4:13:
T7734.hs:5:13:
Occurs check: cannot construct the infinite type: t2 ~ t2 -> t1
Relevant bindings include
- & :: (t2 -> t1) -> t -> t1 (bound at T7734.hs:5:1)
+ (&) :: (t2 -> t1) -> t -> t1 (bound at T7734.hs:5:1)
x :: t2 -> t1 (bound at T7734.hs:5:5)
In the first argument of ‛x’, namely ‛x’
In the expression: x x
diff --git a/tests/typecheck/should_fail/tcfail021.stderr b/tests/typecheck/should_fail/tcfail021.stderr
index 5a4e805..5afea21 100644
--- a/tests/typecheck/should_fail/tcfail021.stderr
+++ b/tests/typecheck/should_fail/tcfail021.stderr
@@ -1,4 +1,4 @@
tcfail021.hs:8:5:
Pattern bindings (except simple variables) not allowed in instance declarations
- (==, /=) = (\ x -> \ y -> True, \ x -> \ y -> False)
+ ((==), (/=)) = (\ x -> \ y -> True, \ x -> \ y -> False)
--
1.7.10.4