From 70361f06e3ea982a2f56d87501ce31d2f29f7e58 Mon Sep 17 00:00:00 2001 From: David Waern Date: Sat, 28 Nov 2009 13:37:59 +0000 Subject: Remove Name from DocInstance It's not used. --- src/Haddock/Interface/AttachInstances.hs | 2 +- src/Haddock/Interface/Rename.hs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/Haddock/Interface') diff --git a/src/Haddock/Interface/AttachInstances.hs b/src/Haddock/Interface/AttachInstances.hs index a10cb36a..43f2466d 100644 --- a/src/Haddock/Interface/AttachInstances.hs +++ b/src/Haddock/Interface/AttachInstances.hs @@ -55,7 +55,7 @@ attachInstances ifaces instIfaceMap = mapM attach ifaces Just (_, _, instances) -> let insts = map (first synifyInstHead) $ sortImage (first instHead) [ (instanceHead i, getName i) | i <- instances ] - in [ (name, inst, lookupInstDoc name iface instIfaceMap) + in [ (inst, lookupInstDoc name iface instIfaceMap) | (inst, name) <- insts ] Nothing -> [] } diff --git a/src/Haddock/Interface/Rename.hs b/src/Haddock/Interface/Rename.hs index 308c86c5..48a14d23 100644 --- a/src/Haddock/Interface/Rename.hs +++ b/src/Haddock/Interface/Rename.hs @@ -453,11 +453,10 @@ renameExportItem item = case item of decl' <- renameLDecl decl doc' <- renameDocForDecl doc subs' <- mapM renameSub subs - instances' <- forM instances $ \(name, inst, idoc) -> do - name' <- rename name + instances' <- forM instances $ \(inst, idoc) -> do inst' <- renameInstHead inst idoc' <- mapM renameDoc idoc - return (name', inst', idoc') + return (inst', idoc') return (ExportDecl decl' doc' subs' instances') ExportNoDecl x subs -> do x' <- lookupRn id x -- cgit v1.2.3