[commit: haddock] 2.15, 2.15.0.1, 2.15.0.2, T6018-injective-type-families, adamse-D1033, clean, fix-travis, ghc-head, master, metainfo, v2.15, wip/10268, wip/10313, wip/D538, wip/D538-1, wip/D538-2, wip/D538-3, wip/D538-4, wip/D538-5, wip/D538-6, wip/D548-master, wip/D548-master-2, wip/T10483, wip/T9840, wip/api-annot-tweaks-7.10, wip/api-annots-ghc-7.10-3, wip/orf-reboot: Revert "Track changes for module reexports." (c90796e)

git at git.haskell.org git at git.haskell.org
Wed Jul 8 08:29:47 UTC 2015


Repository : ssh://git@git.haskell.org/haddock

On branches: 2.15,2.15.0.1,2.15.0.2,T6018-injective-type-families,adamse-D1033,clean,fix-travis,ghc-head,master,metainfo,v2.15,wip/10268,wip/10313,wip/D538,wip/D538-1,wip/D538-2,wip/D538-3,wip/D538-4,wip/D538-5,wip/D538-6,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T9840,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3,wip/orf-reboot
Link       : http://git.haskell.org/haddock.git/commitdiff/c90796ed7a6a625854d28bf55c71eeb36d298c55

>---------------------------------------------------------------

commit c90796ed7a6a625854d28bf55c71eeb36d298c55
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Thu Aug 14 20:23:31 2014 +0100

    Revert "Track changes for module reexports."
    
    This reverts commit b99b57c0df072d12b67816b45eca2a03cb1da96d.


>---------------------------------------------------------------

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

diff --git a/src/Haddock/Interface/Create.hs b/src/Haddock/Interface/Create.hs
index d211530..abc65f1 100644
--- a/src/Haddock/Interface/Create.hs
+++ b/src/Haddock/Interface/Create.hs
@@ -45,7 +45,6 @@ import Bag
 import RdrName
 import TcRnTypes
 import FastString (concatFS)
-import UniqFM
 
 
 -- | Use a 'TypecheckedModule' to produce an 'Interface'.
@@ -171,9 +170,9 @@ lookupModuleDyn _ (Just pkgId) mdlName =
   Module.mkModule pkgId mdlName
 lookupModuleDyn dflags Nothing mdlName =
   flip Module.mkModule mdlName $
-  case filter Packages.modConfExposed . eltsUFM $
+  case filter snd $
        Packages.lookupModuleInAllPackages dflags mdlName of
-    m:_ -> Packages.packageConfigId (Packages.modConfPkg m)
+    (pkgId,_):_ -> Packages.packageConfigId pkgId
     [] -> Module.mainPackageKey
 
 



More information about the ghc-commits mailing list