diff options
| author | Gabor Greif <ggreif@gmail.com> | 2016-08-05 18:16:20 +0200 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2016-08-05 18:16:20 +0200 |
| commit | 8640b7e8042b006845f9871f12df0dc42a502526 (patch) | |
| tree | c83a0dd2ad79ce0044d4c28cb0e6082591932a9e /utils/ghc-pkg/Main.hs | |
| parent | 253fc3888dc170feb8adcd05067020a2ee1ea53e (diff) | |
| download | haskell-wip/ggreif-new-cabal.tar.gz | |
Some raw fixed to compile with TOT Cabalwip/ggreif-new-cabal
Diffstat (limited to 'utils/ghc-pkg/Main.hs')
| -rw-r--r-- | utils/ghc-pkg/Main.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index e0625fec80..332891b437 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -1079,7 +1079,7 @@ type PackageCacheFormat = GhcPkg.InstalledPackageInfo PackageName UnitId ModuleName - OriginalModule + Module convertPackageInfoToCacheFormat :: InstalledPackageInfo -> PackageCacheFormat convertPackageInfoToCacheFormat pkg = @@ -1132,9 +1132,9 @@ instance GhcPkg.BinaryStringRep String where fromStringRep = fromUTF8 . BS.unpack toStringRep = BS.pack . toUTF8 -instance GhcPkg.DbModuleRep UnitId ModuleName OriginalModule where - fromDbModule (GhcPkg.DbModule uid mod_name) = OriginalModule uid mod_name - toDbModule (OriginalModule uid mod_name) = GhcPkg.DbModule uid mod_name +instance GhcPkg.DbModuleRep UnitId ModuleName Module where + fromDbModule (GhcPkg.DbModule uid mod_name) = Module uid mod_name + toDbModule (Module uid mod_name) = GhcPkg.DbModule uid mod_name -- ----------------------------------------------------------------------------- -- Exposing, Hiding, Trusting, Distrusting, Unregistering are all similar @@ -1782,10 +1782,10 @@ checkDuplicateModules pkg checkOriginalModule :: String -> PackageDBStack -> InstalledPackageInfo - -> OriginalModule + -> Module -> Validate () checkOriginalModule field_name db_stack pkg - (OriginalModule definingPkgId definingModule) = + (Module definingPkgId definingModule) = let mpkg = if definingPkgId == installedUnitId pkg then Just pkg else PackageIndex.lookupUnitId ipix definingPkgId |