From b99b57c0df072d12b67816b45eca2a03cb1da96d Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <ezyang@cs.stanford.edu>
Date: Mon, 7 Jul 2014 18:23:40 +0100
Subject: Track changes for module reexports.

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

Conflicts:
	src/Haddock/Interface/Create.hs
---
 src/Haddock/Interface/Create.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Haddock/Interface/Create.hs b/src/Haddock/Interface/Create.hs
index abc65f12..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'.
@@ -170,9 +171,9 @@ lookupModuleDyn _ (Just pkgId) mdlName =
   Module.mkModule pkgId mdlName
 lookupModuleDyn dflags Nothing mdlName =
   flip Module.mkModule mdlName $
-  case filter snd $
+  case filter Packages.modConfExposed . eltsUFM $
        Packages.lookupModuleInAllPackages dflags mdlName of
-    (pkgId,_):_ -> Packages.packageConfigId pkgId
+    m:_ -> Packages.packageConfigId (Packages.modConfPkg m)
     [] -> Module.mainPackageKey
 
 
-- 
cgit v1.2.3