From 9ed2e97db590487df946d1006ae7ffc9d813e351 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 5 Jul 2009 17:01:13 +0000 Subject: Resolve conflicts --- src/Haddock/Interface/Rename.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Haddock/Interface/Rename.hs b/src/Haddock/Interface/Rename.hs index f9b115f1..d28924d8 100644 --- a/src/Haddock/Interface/Rename.hs +++ b/src/Haddock/Interface/Rename.hs @@ -359,7 +359,8 @@ renameTyClD d = case d of details' <- renameDetails details restype' <- renameResType restype mbldoc' <- mapM renameLDoc mbldoc - return (ConDecl lname' expl ltyvars' lcontext' details' restype' mbldoc') + return (decl { con_name = lname', con_qvars = ltyvars', con_cxt = lcontext' + , con_details = details', con_res = restype', con_doc = mbldoc' }) renameDetails (RecCon fields) = return . RecCon =<< mapM renameField fields renameDetails (PrefixCon ps) = return . PrefixCon =<< mapM renameLType ps -- cgit v1.2.3