aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Biehl <abiehl@novomind.com>2017-10-05 11:27:58 +0200
committerAlexander Biehl <abiehl@novomind.com>2017-10-05 11:27:58 +0200
commit527596cdec687f4dc03b3281a400158be60fe36d (patch)
tree75d9e1944b170cc38ec7bff641aa1c13b521a1b7
parent3adf5bcb1a6c5326ab33dc77b4aa229a91d91ce9 (diff)
Revert "Don't use subMap in attachInstances"
This reverts commit 3adf5bcb1a6c5326ab33dc77b4aa229a91d91ce9.
-rw-r--r--haddock-api/src/Haddock/Interface/AttachInstances.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/haddock-api/src/Haddock/Interface/AttachInstances.hs b/haddock-api/src/Haddock/Interface/AttachInstances.hs
index 2231ce7e..0e5811b1 100644
--- a/haddock-api/src/Haddock/Interface/AttachInstances.hs
+++ b/haddock-api/src/Haddock/Interface/AttachInstances.hs
@@ -118,12 +118,12 @@ attachToExportItem index expInfo iface ifaceMap instIfaceMap export =
where
attachFixities e@ExportDecl{ expItemDecl = L _ d
, expItemPats = patsyns
- , expItemSubDocs = subDocs
} = e { expItemFixities =
nubByName fst $ expItemFixities e ++
[ (n',f) | n <- getMainDeclBinder d
- , n' <- n : (map fst subDocs ++ patsyn_names)
- , Just f <- [instLookup instFixMap n' iface ifaceMap instIfaceMap]
+ , Just subs <- [instLookup instSubMap n iface ifaceMap instIfaceMap <|> Just []]
+ , n' <- n : (subs ++ patsyn_names)
+ , Just f <- [instLookup instFixMap n' iface ifaceMap instIfaceMap]
] }
where
patsyn_names = concatMap (getMainDeclBinder . fst) patsyns