Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
b9175104
Commit
b9175104
authored
Apr 19, 2013
by
Krzysztof Gogolewski
Committed by
ian@well-typed.com
Apr 21, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests after
#7848
parent
539a9bf8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
29 deletions
+29
-29
testsuite/tests/generics/GenDerivOutput.stderr
testsuite/tests/generics/GenDerivOutput.stderr
+8
-8
testsuite/tests/generics/GenDerivOutput1_0.stderr
testsuite/tests/generics/GenDerivOutput1_0.stderr
+2
-2
testsuite/tests/generics/GenDerivOutput1_1.stderr
testsuite/tests/generics/GenDerivOutput1_1.stderr
+16
-16
testsuite/tests/typecheck/should_fail/T2688.stderr
testsuite/tests/typecheck/should_fail/T2688.stderr
+1
-1
testsuite/tests/typecheck/should_fail/T7734.stderr
testsuite/tests/typecheck/should_fail/T7734.stderr
+1
-1
testsuite/tests/typecheck/should_fail/tcfail021.stderr
testsuite/tests/typecheck/should_fail/tcfail021.stderr
+1
-1
No files found.
testsuite/tests/generics/GenDerivOutput.stderr
View file @
b9175104
...
...
@@ -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..)
...
...
testsuite/tests/generics/GenDerivOutput1_0.stderr
View file @
b9175104
...
...
@@ -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)
...
...
testsuite/tests/generics/GenDerivOutput1_1.stderr
View file @
b9175104
...
...
@@ -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
...
...
testsuite/tests/typecheck/should_fail/T2688.stderr
View file @
b9175104
...
...
@@ -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’
...
...
testsuite/tests/typecheck/should_fail/T7734.stderr
View file @
b9175104
...
...
@@ -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
...
...
testsuite/tests/typecheck/should_fail/tcfail021.stderr
View file @
b9175104
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)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment