X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FPackageConfig.hs;h=a3fd027bb6f7d5e0f7a0672090c4362ff1ab9014;hb=0f66260b5afc88accb6af6a09b20c3a4de51c39a;hp=4db59addfe6fc3b7a19d9fe5d3d7a9e59638a59e;hpb=c79f08fa35772ea6294bacecbe2bd14ee50c6a94;p=ghc-hetmet.git

diff --git a/compiler/main/PackageConfig.hs b/compiler/main/PackageConfig.hs
index 4db59ad..a3fd027 100644
--- a/compiler/main/PackageConfig.hs
+++ b/compiler/main/PackageConfig.hs
@@ -21,11 +21,11 @@ module PackageConfig (
 
 #include "HsVersions.h"
 
-import Data.Maybe
+import Maybes
 import Module
 import Distribution.InstalledPackageInfo
 import Distribution.ModuleName
-import Distribution.Package
+import Distribution.Package hiding (PackageId)
 import Distribution.Text
 import Distribution.Version
 import Distribution.Compat.ReadP
@@ -71,7 +71,7 @@ unpackPackageId p
         (pid:_) -> Just pid
   where str = packageIdString p
 
--- | Turn a 'PackageConfig', which contains GHC 'ModuleName's into a Cabal specific
+-- | Turn a 'PackageConfig', which contains GHC 'Module.ModuleName's into a Cabal specific
 -- 'InstalledPackageInfo' which contains Cabal 'Distribution.ModuleName.ModuleName's
 packageConfigToInstalledPackageInfo :: PackageConfig -> InstalledPackageInfo
 packageConfigToInstalledPackageInfo
@@ -80,10 +80,10 @@ packageConfigToInstalledPackageInfo
         pkgconf{ exposedModules = map convert e,
                  hiddenModules  = map convert h }
     where convert :: Module.ModuleName -> Distribution.ModuleName.ModuleName
-          convert = fromJust . simpleParse . moduleNameString
+          convert = (expectJust "packageConfigToInstalledPackageInfo") . simpleParse . moduleNameString
 
 -- | Turn an 'InstalledPackageInfo', which contains Cabal 'Distribution.ModuleName.ModuleName's
--- into a GHC specific 'PackageConfig' which contains GHC 'ModuleName's
+-- into a GHC specific 'PackageConfig' which contains GHC 'Module.ModuleName's
 installedPackageInfoToPackageConfig :: InstalledPackageInfo -> PackageConfig
 installedPackageInfoToPackageConfig
     (pkgconf@(InstalledPackageInfo { exposedModules = e,