aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>2014-08-14 20:23:27 +0100
committerMateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>2014-08-14 20:23:27 +0100
commit13d022e89d1fbe81ec318f7cc3ceace980f85d11 (patch)
tree6120350eddeb300a51bd1ef48ebb5ef0561e90cb /src
parent5b81a9e53894d2ae591ca0c6c96199632d39eb06 (diff)
Revert "Track type signature change of lookupModuleInAllPackages"
This reverts commit d59fec2c9551b5662a3507c0011e32a09a9c118f.
Diffstat (limited to 'src')
-rw-r--r--src/Haddock/Interface/Create.hs9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Haddock/Interface/Create.hs b/src/Haddock/Interface/Create.hs
index ad6a1e98..d2115305 100644
--- a/src/Haddock/Interface/Create.hs
+++ b/src/Haddock/Interface/Create.hs
@@ -45,6 +45,7 @@ import Bag
import RdrName
import TcRnTypes
import FastString (concatFS)
+import UniqFM
-- | Use a 'TypecheckedModule' to produce an 'Interface'.
@@ -169,9 +170,11 @@ lookupModuleDyn ::
lookupModuleDyn _ (Just pkgId) mdlName =
Module.mkModule pkgId mdlName
lookupModuleDyn dflags Nothing mdlName =
- case Packages.lookupModuleInAllPackages dflags mdlName of
- (m,_):_ -> m
- [] -> Module.mkModule Module.mainPackageKey mdlName
+ flip Module.mkModule mdlName $
+ case filter Packages.modConfExposed . eltsUFM $
+ Packages.lookupModuleInAllPackages dflags mdlName of
+ m:_ -> Packages.packageConfigId (Packages.modConfPkg m)
+ [] -> Module.mainPackageKey
-------------------------------------------------------------------------------