[commit: ghc] wip/spj-wildcard-refactor: Wibbles plus update haddock submodule (560d70e)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/560d70ed04935054e8ac5dc2f0f3fc931c12125f/ghc

>---------------------------------------------------------------

commit 560d70ed04935054e8ac5dc2f0f3fc931c12125f
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Nov 18 11:34:25 2015 +0000

    Wibbles plus update haddock submodule


>---------------------------------------------------------------

560d70ed04935054e8ac5dc2f0f3fc931c12125f
 testsuite/tests/typecheck/should_run/T7861.stderr | 7 +++----
 utils/haddock                                     | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/typecheck/should_run/T7861.stderr b/testsuite/tests/typecheck/should_run/T7861.stderr
index 80cc901..1183de1 100644
--- a/testsuite/tests/typecheck/should_run/T7861.stderr
+++ b/testsuite/tests/typecheck/should_run/T7861.stderr
@@ -1,9 +1,9 @@
 T7861: T7861.hs:10:5: error:
     Couldn't match type ‘a’ with ‘[a]’
     ‘a’ is a rigid type variable bound by
-        the type signature for:
-          f :: (forall b. a) -> a
-        at T7861.hs:9:6
+      the type signature for:
+        f :: forall a. (forall b. a) -> a
+      at T7861.hs:9:6
     Expected type: (forall b. a) -> a
       Actual type: (forall b. a) -> [a]
     Relevant bindings include
@@ -11,4 +11,3 @@ T7861: T7861.hs:10:5: error:
     In the expression: doA
     In an equation for ‘f’: f = doA
 (deferred type error)
-
diff --git a/utils/haddock b/utils/haddock
index 0d157fe..c122a76 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 0d157fea7d1e4055abcb6453545f8bf326ce2279
+Subproject commit c122a762c7839704644221a251cbe5ad3254f836