diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2016-05-04 14:55:59 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2016-08-08 14:14:42 -0700 |
| commit | fe19be2de14a5506c1af21dc4d574f5ffd6acbdf (patch) | |
| tree | d0d9b439c53c220278f1f2dc31ea1bec4c31aa46 /utils/ghc-pkg/Main.hs | |
| parent | 4d9c22d01561bda90632d9a470fd2a2bb167658a (diff) | |
| download | haskell-fe19be2de14a5506c1af21dc4d574f5ffd6acbdf.tar.gz | |
Cabal submodule update.
There's a substantial bump to the haddock.Cabal allocation
stats, because we added 50% more modules, so of course allocations
are going to increase 50%. (But perhaps this is indicative of
some bad constant factor in Haddock related to modules.)
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Test Plan: validate
Reviewers: ggreif, austin, bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2442
Diffstat (limited to 'utils/ghc-pkg/Main.hs')
| -rw-r--r-- | utils/ghc-pkg/Main.hs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index e0625fec80..399522ad1c 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 @@ -1741,7 +1741,7 @@ checkExposedModules db_stack pkg = where checkExposedModule (ExposedModule modl reexport) = do let checkOriginal = checkModuleFile pkg modl - checkReexport = checkOriginalModule "module reexport" db_stack pkg + checkReexport = checkModule "module reexport" db_stack pkg maybe checkOriginal checkReexport reexport -- | Validates the existence of an appropriate @hi@ file associated with @@ -1779,13 +1779,13 @@ checkDuplicateModules pkg -- implementation, then we should also check that the original module in -- question is NOT a signature (however, if it is a reexport, then it's fine -- for the original module to be a signature.) -checkOriginalModule :: String +checkModule :: String -> PackageDBStack -> InstalledPackageInfo - -> OriginalModule + -> Module -> Validate () -checkOriginalModule field_name db_stack pkg - (OriginalModule definingPkgId definingModule) = +checkModule field_name db_stack pkg + (Module definingPkgId definingModule) = let mpkg = if definingPkgId == installedUnitId pkg then Just pkg else PackageIndex.lookupUnitId ipix definingPkgId |