diff options
| -rw-r--r-- | src/Haddock/Backends/Html.hs | 2 | ||||
| -rw-r--r-- | src/Haddock/Interface/AttachInstances.hs | 2 | ||||
| -rw-r--r-- | src/Haddock/Interface/Rename.hs | 5 | ||||
| -rw-r--r-- | src/Haddock/Types.hs | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/Haddock/Backends/Html.hs b/src/Haddock/Backends/Html.hs index 93c2a491..073dd66a 100644 --- a/src/Haddock/Backends/Html.hs +++ b/src/Haddock/Backends/Html.hs @@ -1200,7 +1200,7 @@ ppClassDecl _ _ _ _ _ _ _ _ = error "declaration type not supported by ppShortCl -- an 'argBox'. The comment is printed to the right of the box in normal comment -- style. ppDocInstance :: Bool -> DocInstance DocName -> HtmlTable -ppDocInstance unicode (_, instHead, maybeDoc) = +ppDocInstance unicode (instHead, maybeDoc) = argBox (ppInstHead unicode instHead) <-> maybeRDocBox maybeDoc 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 diff --git a/src/Haddock/Types.hs b/src/Haddock/Types.hs index 38a1e130..be326c60 100644 --- a/src/Haddock/Types.hs +++ b/src/Haddock/Types.hs @@ -40,7 +40,7 @@ import Name type Decl = LHsDecl Name type Doc = HsDoc Name -type DocInstance name = (name, InstHead name, Maybe (HsDoc name)) +type DocInstance name = (InstHead name, Maybe (HsDoc name)) #if __GLASGOW_HASKELL__ <= 610 type HsDocString = HsDoc Name |