diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2021-09-23 12:31:38 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-10-22 19:20:44 -0400 |
| commit | 6fd7da745a518a93f6685171701a27283cfe2d4e (patch) | |
| tree | 9feb7db12f7d892e960af948b7ebbf271dd0ff3f /utils | |
| parent | fa5870d3ac0a64515d3e76af256e81b9dc8590bd (diff) | |
| download | haskell-6fd7da745a518a93f6685171701a27283cfe2d4e.tar.gz | |
Remove Indefinite
We no longer need it after previous IndefUnitId refactoring.
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-pkg/Main.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index a83f60b87a..4df73001d5 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -1315,7 +1315,6 @@ updateDBCache verbosity db db_stack = do GhcPkg.DbOpenReadWrite lock -> GhcPkg.unlockPackageDb lock type PackageCacheFormat = GhcPkg.GenericUnitInfo - ComponentId PackageIdentifier PackageName UnitId @@ -1375,7 +1374,7 @@ recomputeValidAbiDeps db pkg = -- Ghc.PackageDb to store into the database) fromPackageCacheFormat :: PackageCacheFormat -> GhcPkg.DbUnitInfo fromPackageCacheFormat = GhcPkg.mapGenericUnitInfo - mkUnitId' mkComponentId' mkPackageIdentifier' mkPackageName' mkModuleName' mkModule' + mkUnitId' mkPackageIdentifier' mkPackageName' mkModuleName' mkModule' where displayBS :: Pretty a => a -> BS.ByteString displayBS = toUTF8BS . display @@ -1396,7 +1395,7 @@ convertPackageInfoToCacheFormat :: InstalledPackageInfo -> PackageCacheFormat convertPackageInfoToCacheFormat pkg = GhcPkg.GenericUnitInfo { GhcPkg.unitId = installedUnitId pkg, - GhcPkg.unitInstanceOf = installedComponentId pkg, + GhcPkg.unitInstanceOf = mkUnitId (unComponentId (installedComponentId pkg)), GhcPkg.unitInstantiations = instantiatedWith pkg, GhcPkg.unitPackageId = sourcePackageId pkg, GhcPkg.unitPackageName = packageName pkg, |