X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FPackageConfig.hs;h=f3cede68dabff7f9cd754eacb14136078bbaa3ad;hb=cadba81047f6188fad2fe07004c3cb36316c36d1;hp=1602429f64d6b79f44b30a9fcd2c314b38cebbb9;hpb=c7c65e17b956aedbdb47b0976c8dcaa284a97945;p=ghc-hetmet.git diff --git a/compiler/main/PackageConfig.hs b/compiler/main/PackageConfig.hs index 1602429..f3cede6 100644 --- a/compiler/main/PackageConfig.hs +++ b/compiler/main/PackageConfig.hs @@ -15,13 +15,13 @@ module PackageConfig ( Version(..), PackageIdentifier(..), defaultPackageConfig, - packageConfigToInstalledPackageInfo, - installedPackageInfoToPackageConfig, + packageConfigToInstalledPackageInfo, + installedPackageInfoToPackageConfig, ) where #include "HsVersions.h" -import Data.Maybe +import Maybes import Module import Distribution.InstalledPackageInfo import Distribution.ModuleName @@ -80,7 +80,7 @@ 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 'Module.ModuleName's