diff options
| author | Austin Seipp <austin@well-typed.com> | 2015-05-11 06:03:43 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2015-05-11 06:03:43 -0500 |
| commit | 5753910079649a6b6d0e004c0ccb1c3ed0676289 (patch) | |
| tree | 0a9d6fe46c0c7690c6ced0a7320f4a41c2e7d97e | |
| parent | 1915e7f3ab4b801bec5557709a18368c20b0036d (diff) | |
| download | haskell-5753910079649a6b6d0e004c0ccb1c3ed0676289.tar.gz | |
Fix merge-o in testsuite output that I missed
Signed-off-by: Austin Seipp <austin@well-typed.com>
| -rw-r--r-- | testsuite/tests/ghci/scripts/T8485.stderr | 2 | ||||
| -rw-r--r-- | testsuite/tests/typecheck/should_fail/T10285.stderr | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/testsuite/tests/ghci/scripts/T8485.stderr b/testsuite/tests/ghci/scripts/T8485.stderr index bbef720fe2..5edf696520 100644 --- a/testsuite/tests/ghci/scripts/T8485.stderr +++ b/testsuite/tests/ghci/scripts/T8485.stderr @@ -1,4 +1,4 @@ -<interactive>:3:11: error: +<interactive>:3:11: The role annotation for ‘X’ lacks an accompanying binding (The role annotation must be given where ‘X’ is declared) diff --git a/testsuite/tests/typecheck/should_fail/T10285.stderr b/testsuite/tests/typecheck/should_fail/T10285.stderr index b56f124d12..47cfbec8c9 100644 --- a/testsuite/tests/typecheck/should_fail/T10285.stderr +++ b/testsuite/tests/typecheck/should_fail/T10285.stderr @@ -1,18 +1,18 @@ -T10285.hs:8:17: error: - Could not deduce: a ~ b - from the context: Coercible (N a) (N b) - bound by a pattern with constructor: +T10285.hs:8:17: + Could not deduce (a ~ b) + from the context (Coercible (N a) (N b)) + bound by a pattern with constructor Coercion :: forall (k :: BOX) (a :: k) (b :: k). Coercible a b => Coercion a b, in an equation for ‘oops’ at T10285.hs:8:6-13 ‘a’ is a rigid type variable bound by - the type signature for: oops :: Coercion (N a) (N b) -> a -> b + the type signature for oops :: Coercion (N a) (N b) -> a -> b at T10285.hs:7:9 ‘b’ is a rigid type variable bound by - the type signature for: oops :: Coercion (N a) (N b) -> a -> b + the type signature for oops :: Coercion (N a) (N b) -> a -> b at T10285.hs:7:9 Relevant bindings include oops :: Coercion (N a) (N b) -> a -> b (bound at T10285.hs:8:1) |