Rename package key to unit ID, and installed package ID to component ID.

Comes with Haddock submodule update.

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

5 files changed, 16 insertions, 16 deletions

diff --git a/libraries/base/GHC/StaticPtr.hs b/libraries/base/GHC/StaticPtr.hs
index 302d027c0a..117d70525a 100644
--- a/libraries/base/GHC/StaticPtr.hs
+++ b/libraries/base/GHC/StaticPtr.hs
@@ -83,7 +83,7 @@ foreign import ccall unsafe hs_spt_lookup :: Ptr () -> IO (Ptr a)
 -- | Miscelaneous information available for debugging purposes.
 data StaticPtrInfo = StaticPtrInfo
     { -- | Package key of the package where the static pointer is defined
-      spInfoPackageKey  :: String
+      spInfoUnitId  :: String
       -- | Name of the module where the static pointer is defined
     , spInfoModuleName :: String
       -- | An internal name that is distinct for every static pointer defined in
diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index 6545db5901..326f4579fd 100644
--- a/libraries/base/base.cabal
+++ b/libraries/base/base.cabal
@@ -342,6 +342,6 @@ Library
             GHC.Event.TimerManager
             GHC.Event.Unique
 
-    -- We need to set the package key to base (without a version number)
+    -- We need to set the unit id to base (without a version number)
     -- as it's magic.
     ghc-options: -this-package-key base
diff --git a/libraries/ghc-boot/GHC/PackageDb.hs b/libraries/ghc-boot/GHC/PackageDb.hs
index 1f6b54f151..fcb24d8a46 100644
--- a/libraries/ghc-boot/GHC/PackageDb.hs
+++ b/libraries/ghc-boot/GHC/PackageDb.hs
@@ -68,11 +68,11 @@ import System.Directory
 --
 data InstalledPackageInfo instpkgid srcpkgid srcpkgname pkgkey modulename
    = InstalledPackageInfo {
-       installedPackageId :: instpkgid,
+       componentId :: instpkgid,
        sourcePackageId    :: srcpkgid,
        packageName        :: srcpkgname,
        packageVersion     :: Version,
-       packageKey         :: pkgkey,
+       unitId         :: pkgkey,
        abiHash            :: String,
        depends            :: [pkgkey],
        importDirs         :: [FilePath],
@@ -146,11 +146,11 @@ emptyInstalledPackageInfo :: (BinaryStringRep a, BinaryStringRep b,
                           => InstalledPackageInfo a b c d e
 emptyInstalledPackageInfo =
   InstalledPackageInfo {
-       installedPackageId = fromStringRep BS.empty,
+       componentId = fromStringRep BS.empty,
        sourcePackageId    = fromStringRep BS.empty,
        packageName        = fromStringRep BS.empty,
        packageVersion     = Version [] [],
-       packageKey         = fromStringRep BS.empty,
+       unitId         = fromStringRep BS.empty,
        abiHash            = "",
        depends            = [],
        importDirs         = [],
@@ -301,8 +301,8 @@ instance (BinaryStringRep a, BinaryStringRep b, BinaryStringRep c,
           BinaryStringRep d, BinaryStringRep e) =>
          Binary (InstalledPackageInfo a b c d e) where
   put (InstalledPackageInfo
-         installedPackageId sourcePackageId
-         packageName packageVersion packageKey
+         componentId sourcePackageId
+         packageName packageVersion unitId
          abiHash depends importDirs
          hsLibraries extraLibraries extraGHCiLibraries libraryDirs
          frameworks frameworkDirs
@@ -311,11 +311,11 @@ instance (BinaryStringRep a, BinaryStringRep b, BinaryStringRep c,
          haddockInterfaces haddockHTMLs
          exposedModules hiddenModules instantiatedWith
          exposed trusted) = do
-    put (toStringRep installedPackageId)
+    put (toStringRep componentId)
     put (toStringRep sourcePackageId)
     put (toStringRep packageName)
     put packageVersion
-    put (toStringRep packageKey)
+    put (toStringRep unitId)
     put abiHash
     put (map toStringRep depends)
     put importDirs
@@ -338,11 +338,11 @@ instance (BinaryStringRep a, BinaryStringRep b, BinaryStringRep c,
     put trusted
 
   get = do
-    installedPackageId <- get
+    componentId <- get
     sourcePackageId    <- get
     packageName        <- get
     packageVersion     <- get
-    packageKey         <- get
+    unitId         <- get
     abiHash            <- get
     depends            <- get
     importDirs         <- get
@@ -364,10 +364,10 @@ instance (BinaryStringRep a, BinaryStringRep b, BinaryStringRep c,
     exposed            <- get
     trusted            <- get
     return (InstalledPackageInfo
-              (fromStringRep installedPackageId)
+              (fromStringRep componentId)
               (fromStringRep sourcePackageId)
               (fromStringRep packageName) packageVersion
-              (fromStringRep packageKey)
+              (fromStringRep unitId)
               abiHash
               (map fromStringRep depends)
               importDirs
diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal
index 58b6ee0a03..ab59a938d4 100644
--- a/libraries/ghc-prim/ghc-prim.cabal
+++ b/libraries/ghc-prim/ghc-prim.cabal
@@ -64,6 +64,6 @@ Library
         cbits/popcnt.c
         cbits/word2float.c
 
-    -- We need to set the package key to ghc-prim (without a version number)
+    -- We need to set the unit ID to ghc-prim (without a version number)
     -- as it's magic.
     ghc-options: -this-package-key ghc-prim
diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal
index dd31604e95..f1265d494e 100644
--- a/libraries/template-haskell/template-haskell.cabal
+++ b/libraries/template-haskell/template-haskell.cabal
@@ -51,7 +51,7 @@ Library
         ghc-boot,
         pretty     == 1.1.*
 
-    -- We need to set the package key to template-haskell (without a
+    -- We need to set the unit ID to template-haskell (without a
     -- version number) as it's magic.
     ghc-options: -Wall