X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FPackageConfig.hs;h=a3fd027bb6f7d5e0f7a0672090c4362ff1ab9014;hb=5e12e5be4fe676a79669f9a0cb5265e5cd33bebe;hp=239a917560bdc4f17406545a09ceffca6192a819;hpb=c735a21acf3e478df36f630cf224dcb3755db485;p=ghc-hetmet.git

diff --git a/compiler/main/PackageConfig.hs b/compiler/main/PackageConfig.hs
index 239a917..a3fd027 100644
--- a/compiler/main/PackageConfig.hs
+++ b/compiler/main/PackageConfig.hs
@@ -21,7 +21,7 @@ module PackageConfig (
 
 #include "HsVersions.h"
 
-import Data.Maybe
+import Maybes
 import Module
 import Distribution.InstalledPackageInfo
 import Distribution.ModuleName
@@ -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,