X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FPackageConfig.hs;h=1602429f64d6b79f44b30a9fcd2c314b38cebbb9;hb=8ef97aa30a33fb3b536252b2c0459cdf0fd5236f;hp=9cd6e23ecbf5a4c187ce21e57021e540512b1cbd;hpb=5b1fbf18b16c504bcd998d1cb7bfa015a79b50df;p=ghc-hetmet.git

diff --git a/compiler/main/PackageConfig.hs b/compiler/main/PackageConfig.hs
index 9cd6e23..1602429 100644
--- a/compiler/main/PackageConfig.hs
+++ b/compiler/main/PackageConfig.hs
@@ -25,7 +25,7 @@ import Data.Maybe
 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
@@ -50,7 +50,7 @@ defaultPackageConfig = emptyInstalledPackageInfo
 -- package sub-system.
 --
 -- This means that in theory you could have multiple base packages installed
--- (for example), and switch between them using @-package@/@-hide-package@.
+-- (for example), and switch between them using @-package@\/@-hide-package@.
 --
 -- A 'PackageId' is a string of the form @<pkg>-<version>@.
 
@@ -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
@@ -83,7 +83,7 @@ packageConfigToInstalledPackageInfo
           convert = fromJust . 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,