diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-07-05 17:01:13 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-07-05 17:01:13 +0000 |
| commit | 9ed2e97db590487df946d1006ae7ffc9d813e351 (patch) | |
| tree | 8a4df0c966a608861f8ef485b0d974a290f2f0b0 /src | |
| parent | f3d2dd5e9459683810c7292e39690f0472891224 (diff) | |
Resolve conflicts
Diffstat (limited to 'src')
| -rw-r--r-- | src/Haddock/Interface/Rename.hs | 3 |
1 files changed, 2 insertions, 1 deletions
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 |