[commit: haddock] wip/D538-1: Rebase against master (e9a17bd)

[git at git.haskell.org]

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

On branch  : wip/D538-1
Link       : http://git.haskell.org/haddock.git/commitdiff/e9a17bd9407e9ae780737cfc0ae457f7a294ff60

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

commit e9a17bd9407e9ae780737cfc0ae457f7a294ff60
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Wed Dec 17 00:58:14 2014 +0200

    Rebase against master


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

e9a17bd9407e9ae780737cfc0ae457f7a294ff60
 haddock-api/src/Haddock/Backends/Xhtml/Decl.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
index c164bc0..cb5956e 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
@@ -146,7 +146,7 @@ ppTypeOrFunSig summary links loc docnames typ (doc, argDocs) (pref1, pref2, sep)
 
 ppForAll :: LHsTyVarBndrs DocName -> Unicode -> Qualification -> Html
 ppForAll tvs unicode qual =
-  case [ppKTv n k | L _ (KindedTyVar n k) <- hsQTvBndrs tvs] of
+  case [ppKTv n k | L _ (KindedTyVar (L _ n) k) <- hsQTvBndrs tvs] of
     [] -> noHtml
     ts -> forallSymbol unicode <+> hsep ts +++ dot
   where ppKTv n k = parens $
@@ -618,7 +618,7 @@ ppShortConstrParts summary dataInst con unicode qual = case con_res con of
     -- (except each field gets its own line in docs, to match
     -- non-GADT records)
     RecCon (L _ fields) -> (ppOcc <+> dcolon unicode <+>
-                            ppForAll forall_ ltvs lcontext unicode qual <+> char '{',
+                            ppForAllCon forall_ ltvs lcontext unicode qual <+> char '{',
                             doRecordFields fields,
                             char '}' <+> arrow unicode <+> ppLType unicode qual resTy)
     InfixCon arg1 arg2 -> (doGADTCon [arg1, arg2] resTy, noHtml, noHtml)