Skip to content

Commit

Permalink
Fix tests after #7848
Browse files Browse the repository at this point in the history
  • Loading branch information
@monoidal
monoidal authored and Ian Lynagh committed Apr 21, 2013
1 parent 1ec6d9f commit 8bb42aa
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 29 deletions.
16 changes: 8 additions & 8 deletions tests/generics/GenDerivOutput.stderr
View file
Expand Up @@ -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
Expand All @@ -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)

Expand All @@ -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
Expand All @@ -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..)
Expand Down
4 changes: 2 additions & 2 deletions tests/generics/GenDerivOutput1_0.stderr
View file
Expand Up @@ -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)

Expand Down
32 changes: 16 additions & 16 deletions tests/generics/GenDerivOutput1_1.stderr
View file
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/typecheck/should_fail/T2688.stderr
View file
Expand Up @@ -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’
Expand Down
2 changes: 1 addition & 1 deletion tests/typecheck/should_fail/T7734.stderr
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/typecheck/should_fail/tcfail021.stderr
View file
@@ -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)

0 comments on commit 8bb42aa

Please sign in to comment.