Merge branch 'master' of http://darcs.haskell.org/testsuite

Conflicts:
	tests/typecheck/should_fail/tcfail181.stderr

1 files changed, 17 insertions, 16 deletions

diff --git a/testsuite/tests/typecheck/should_fail/tcfail181.stderr b/testsuite/tests/typecheck/should_fail/tcfail181.stderr
index 8110f2e309..690cbe7cf1 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail181.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail181.stderr
@@ -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}
+