Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/47711abc5d655b82b50422bbfb0b9840824e0ecd >--------------------------------------------------------------- commit 47711abc5d655b82b50422bbfb0b9840824e0ecd Merge: 82045dc... 5774835... Author: Simon Peyton Jones <[email protected]> Date: Tue Jul 10 16:27:14 2012 +0100 Merge branch 'master' of http://darcs.haskell.org/testsuite Conflicts: tests/typecheck/should_fail/tcfail181.stderr .gitignore | 13 +++++++ config/ghc | 2 +- tests/codeGen/should_run/T5900.hs | 25 ++++++++++++++ tests/codeGen/should_run/T5900.stderr | 1 + tests/codeGen/should_run/T5900.stdout | 1 + tests/codeGen/should_run/all.T | 2 +- tests/concurrent/should_run/conc024.hs | 3 ++ tests/concurrent/should_run/conc029.hs | 3 ++ tests/concurrent/should_run/conc030.hs | 3 ++ tests/concurrent/should_run/conc034.hs | 3 ++ .../concurrent/should_run/foreignInterruptible.hs | 5 ++- tests/deSugar/should_compile/ds055.hs | 1 - tests/ghci/scripts/T5975a.script | 2 +- tests/ghci/scripts/all.T | 9 +++-- tests/lib/integer/IntegerConversionRules.hs | 20 +++++++++++ tests/lib/integer/Makefile | 11 ++++++ tests/lib/integer/all.T | 4 ++ tests/llvm/should_compile/6158.hs | 11 ++++++ tests/llvm/should_compile/all.T | 1 + tests/numeric/should_run/numrun012.hs | 4 +- tests/numeric/should_run/numrun012.stdout | 2 +- tests/parser/should_fail/readFail009.stderr | 3 +- tests/parser/should_fail/readFail012.stderr | 2 +- tests/parser/should_fail/readFail015.stderr | 2 +- tests/parser/should_fail/readFail047.stderr | 2 +- tests/perf/compiler/all.T | 20 +++++------ tests/perf/should_run/all.T | 3 +- tests/plugins/simple-plugin/Makefile | 3 +- tests/quasiquotation/T4491/test.T | 3 +- tests/rts/Makefile | 7 ++++ tests/rts/T7037.hs | 1 + tests/{gadt/CasePrune.stdout => rts/T7037.stdout} | 0 tests/rts/T7037_main.c | 6 +++ tests/rts/all.T | 4 ++ tests/safeHaskell/unsafeLibs/GoodImport03.hs | 4 -- tests/simplCore/should_compile/Makefile | 8 +++++ tests/simplCore/should_compile/T4138.hs | 20 +++++++++++ .../should_compile/T4138.stdout} | 0 tests/simplCore/should_compile/T4138_A.hs | 11 ++++++ tests/simplCore/should_compile/all.T | 4 ++ .../should_compile/SilentParametersOverlapping.hs | 19 ----------- tests/typecheck/should_compile/T4361.hs | 3 +- tests/typecheck/should_compile/T5051.hs | 33 ------------------- tests/typecheck/should_compile/all.T | 2 - .../should_fail/SilentParametersOverlapping.hs | 19 +++++++++++ .../should_fail/SilentParametersOverlapping.stderr | 13 +++++++ tests/typecheck/should_fail/T5051.hs | 34 ++++++++++++++++++++ tests/typecheck/should_fail/T5051.stderr | 11 ++++++ tests/typecheck/should_fail/T5691.stderr | 6 --- tests/typecheck/should_fail/all.T | 2 + tests/typecheck/should_fail/tcfail019.stderr | 6 --- tests/typecheck/should_fail/tcfail041.stderr | 7 ---- tests/typecheck/should_fail/tcfail042.stderr | 15 --------- tests/typecheck/should_fail/tcfail106.stderr | 6 --- tests/typecheck/should_fail/tcfail181.stderr | 1 + tests/typecheck/should_fail/tcfail189.stderr | 29 +++++++++++++++++ tests/typecheck/should_run/IPRun.hs | 2 +- 57 files changed, 306 insertions(+), 131 deletions(-) diff --cc tests/typecheck/should_fail/tcfail181.stderr index 8110f2e,ebb2eb5..690cbe7 --- a/tests/typecheck/should_fail/tcfail181.stderr +++ b/tests/typecheck/should_fail/tcfail181.stderr @@@ -1,16 -1,16 +1,17 @@@ - - tcfail181.hs:17:9: - Could not deduce (Monad m0) arising from a use of `foo' - from the context (Monad m) - bound by the inferred type of - wog :: Monad m => t -> Something (m Bool) e - at tcfail181.hs:17:1-30 - The type variable `m0' is ambiguous - Possible fix: add a type signature that fixes these type variable(s) - Note: there are several potential instances: - instance Monad ((->) r) -- Defined in `GHC.Base' - instance Monad IO -- Defined in `GHC.Base' - instance Monad [] -- Defined in `GHC.Base' - In the expression: foo - In the expression: foo {bar = return True} - In an equation for `wog': wog x = foo {bar = return True} + + tcfail181.hs:17:9: + Could not deduce (Monad m0) arising from a use of `foo' + from the context (Monad m) + bound by the inferred type of + wog :: Monad m => t -> Something (m Bool) e + at tcfail181.hs:17:1-30 + The type variable `m0' is ambiguous + Possible fix: add a type signature that fixes these type variable(s) + Note: there are several potential instances: + instance Monad ((->) r) -- Defined in `GHC.Base' + instance Monad IO -- Defined in `GHC.Base' + instance Monad [] -- Defined in `GHC.Base' + In the expression: foo + In the expression: foo {bar = return True} + In an equation for `wog': wog x = foo {bar = return True} ++ _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
