[commit: haddock] wip/T11080-open-data-kinds: Follow changes from #11080 (03d012f)
git at git.haskell.org
git at git.haskell.org
Tue Nov 28 11:43:26 UTC 2017
Repository : ssh://git@git.haskell.org/haddock
On branch : wip/T11080-open-data-kinds
Link : http://git.haskell.org/haddock.git/commitdiff/03d012f16e532f2323de74b0597576780d1f1ec0
>---------------------------------------------------------------
commit 03d012f16e532f2323de74b0597576780d1f1ec0
Author: Jan Stolarek <jan.stolarek at p.lodz.pl>
Date: Thu Jan 14 16:08:08 2016 +0100
Follow changes from #11080
>---------------------------------------------------------------
03d012f16e532f2323de74b0597576780d1f1ec0
haddock-api/src/Haddock/Interface/Rename.hs | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/haddock-api/src/Haddock/Interface/Rename.hs b/haddock-api/src/Haddock/Interface/Rename.hs
index 0f97ee3..517e8ac 100644
--- a/haddock-api/src/Haddock/Interface/Rename.hs
+++ b/haddock-api/src/Haddock/Interface/Rename.hs
@@ -405,13 +405,15 @@ renameFamilyInfo (ClosedTypeFamily eqns)
; return $ ClosedTypeFamily eqns' }
renameDataDefn :: HsDataDefn Name -> RnM (HsDataDefn DocName)
-renameDataDefn (HsDataDefn { dd_ND = nd, dd_ctxt = lcontext, dd_cType = cType
+renameDataDefn (HsDataDefn { dd_ND = nd, dd_kindOnly = allowed_in_terms
+ , dd_ctxt = lcontext, dd_cType = cType
, dd_kindSig = k, dd_cons = cons }) = do
lcontext' <- renameLContext lcontext
k' <- renameMaybeLKind k
cons' <- mapM (mapM renameCon) cons
-- I don't think we need the derivings, so we return Nothing
- return (HsDataDefn { dd_ND = nd, dd_ctxt = lcontext', dd_cType = cType
+ return (HsDataDefn { dd_ND = nd, dd_kindOnly = allowed_in_terms
+ , dd_ctxt = lcontext', dd_cType = cType
, dd_kindSig = k', dd_cons = cons', dd_derivs = Nothing })
renameCon :: ConDecl Name -> RnM (ConDecl DocName)
More information about the ghc-commits
mailing list