Merge pull request #6446 from commercialhaskell/other-prefix

Remove various prefixes from field names of types

Author: mpilgrem

src/GHC/Utils/GhcPkg/Main/Compat.hs

@@ -398,8 +398,8 @@ readParseDatabase mode path = do
        [InstalledPackageInfo]
     -> GhcPkg.DbOpenMode mode GhcPkg.PackageDbLock
     -> RIO env (PackageDB mode)
-  mkPackageDB pkgs lock = do
-    pure $ PackageDB
+  mkPackageDB pkgs lock =
+    pure PackageDB
       { location = path
       , packageDbLock = lock
       , packages = pkgs

src/Stack/Build/Cache.hs

@@ -266,7 +266,7 @@ flagCacheKey installed = do
   installationRoot <- installationRootLocal
   case installed of
     Library _ installedInfo -> do
-      let gid = installedInfo.iliId
+      let gid = installedInfo.ghcPkgId
       pure $ configCacheKey installationRoot (ConfigCacheTypeFlagLibrary gid)
     Executable ident -> pure $
       configCacheKey installationRoot (ConfigCacheTypeFlagExecutable ident)

src/Stack/Build/ExecutePackage.hs

@@ -999,7 +999,7 @@ singleTest topts testsToRun ac ee task installedMap = do
               idMap <- liftIO $ readTVarIO ee.ghcPkgIds
               pure $ Map.lookup (taskProvides task) idMap
           let pkgGhcIdList = case installed of
-                               Just (Library _ libInfo) -> [libInfo.iliId]
+                               Just (Library _ libInfo) -> [libInfo.ghcPkgId]
                                _ -> []
           -- doctest relies on template-haskell in QuickCheck-based tests
           thGhcId <-

src/Stack/Build/Installed.hs

@@ -1,7 +1,8 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE OverloadedRecordDot #-}
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE ScopedTypeVariables   #-}
 
 -- Determine which packages are already installed
 module Stack.Build.Installed
@@ -298,12 +299,12 @@ gatherAndTransformSubLoadHelper lh =
       (_, Library _ existingLibInfo)
     = ( pLoc
       , Library pn existingLibInfo
-          { iliSublib = Map.union
-              incomingLibInfo.iliSublib
-              existingLibInfo.iliSublib
-          , iliId = if isJust lh.lhSublibrary
-                      then existingLibInfo.iliId
-                      else incomingLibInfo.iliId
+          { subLib = Map.union
+              incomingLibInfo.subLib
+              existingLibInfo.subLib
+          , ghcPkgId = if isJust lh.lhSublibrary
+                      then existingLibInfo.ghcPkgId
+                      else incomingLibInfo.ghcPkgId
           }
       )
   onPreviousLoadHelper newVal _oldVal = newVal
@@ -316,5 +317,5 @@ gatherAndTransformSubLoadHelper lh =
       (Library (PackageIdentifier _sublibMungedPackageName version) libInfo)
     = Library
         (PackageIdentifier key version)
-        libInfo {iliSublib = Map.singleton sd.libraryName libInfo.iliId}
+        libInfo { subLib = Map.singleton sd.libraryName libInfo.ghcPkgId }
   updateAsSublib _ v = v

src/Stack/Build/Source.hs

@@ -462,7 +462,7 @@ checkBuildCache oldCache files = do
   go fp _ _ | takeFileName fp == "cabal_macros.h" = pure (Set.empty, Map.empty)
   -- Common case where it's in the cache and on the filesystem.
   go fp (Just digest') (Just fci)
-      | fci.fciHash == digest' = pure (Set.empty, Map.singleton fp fci)
+      | fci.hash == digest' = pure (Set.empty, Map.singleton fp fci)
       | otherwise =
           pure (Set.singleton fp, Map.singleton fp $ FileCacheInfo digest')
   -- Missing file. Add it to dirty files, but no FileCacheInfo.

src/Stack/Config.hs

@@ -326,7 +326,7 @@ configFromConfigMonoid
         os = defOS
         platform = Platform arch os
         requireStackVersion = simplifyVersionRange
-          configMonoid.requireStackVersion.getIntersectingVersionRange
+          configMonoid.requireStackVersion.intersectingVersionRange
         compilerCheck = fromFirst MatchMinor configMonoid.compilerCheck
     platformVariant <- liftIO $
       maybe PlatformVariantNone PlatformVariant <$> lookupEnv platformVariantEnvVar

src/Stack/Config/Docker.hs

@@ -20,7 +20,7 @@ import           Stack.Types.Docker
                    , DockerOptsMonoid (..), dockerImageArgName
                    )
 import           Stack.Types.Resolver ( AbstractResolver (..) )
-import           Stack.Types.Version ( getIntersectingVersionRange )
+import           Stack.Types.Version ( IntersectingVersionRange (..) )
 
 -- | Type representing exceptions thrown by functions exported by the
 -- "Stack.Config.Docker" module.
@@ -105,9 +105,9 @@ dockerOptsFromMonoid mproject maresolver dockerMonoid = do
       setUser = getFirst dockerMonoid.setUser
       requireDockerVersion =
         simplifyVersionRange
-          dockerMonoid.requireDockerVersion.getIntersectingVersionRange
+          dockerMonoid.requireDockerVersion.intersectingVersionRange
       stackExe = getFirst dockerMonoid.stackExe
-  pure $ DockerOpts
+  pure DockerOpts
     { enable
     , image
     , registryLogin

src/Stack/Config/Nix.hs

@@ -73,7 +73,7 @@ nixOptsFromMonoid nixMonoid os = do
 
   when (not (null packages) && isJust initFile) $
     throwIO NixCannotUseShellFileAndPackagesException
-  pure $ NixOpts
+  pure NixOpts
     { enable
     , pureShell
     , packages

src/Stack/Ghci.hs

@@ -536,12 +536,12 @@ runGhci
                 ++ M.foldMapWithKey subDepsPackageUnhide exposeInternalDep
               else []
           oneWordOpts bio
-            | shouldHidePackages = bio.bioOneWordOpts ++ bio.bioPackageFlags
-            | otherwise = bio.bioOneWordOpts
+            | shouldHidePackages = bio.oneWordOpts ++ bio.packageFlags
+            | otherwise = bio.oneWordOpts
           genOpts = nubOrd
             (concatMap (concatMap (oneWordOpts . snd) . (.ghciPkgOpts)) pkgs)
           (omittedOpts, ghcOpts) = L.partition badForGhci $
-               concatMap (concatMap ((.bioOpts) . snd) . (.ghciPkgOpts)) pkgs
+               concatMap (concatMap ((.opts) . snd) . (.ghciPkgOpts)) pkgs
             ++ map
                  T.unpack
                  (  fold config.ghcOptionsByCat
@@ -623,7 +623,7 @@ writeMacrosFile ::
 writeMacrosFile outputDirectory pkgs = do
   fps <- fmap (nubOrd . catMaybes . concat) $
     forM pkgs $ \pkg -> forM pkg.ghciPkgOpts $ \(_, bio) -> do
-      let cabalMacros = bio.bioCabalMacros
+      let cabalMacros = bio.cabalMacros
       exists <- liftIO $ doesFileExist cabalMacros
       if exists
         then pure $ Just cabalMacros
@@ -1076,7 +1076,7 @@ checkForIssues pkgs =
    where
     (xs, ys) = L.partition (any f . snd) compsWithOpts
   compsWithOpts = map (\(k, bio) ->
-    (k, bio.bioOneWordOpts ++ bio.bioOpts)) compsWithBios
+    (k, bio.oneWordOpts ++ bio.opts)) compsWithBios
   compsWithBios =
     [ ((pkg.ghciPkgName, c), bio)
     | pkg <- pkgs

src/Stack/New.hs

@@ -445,7 +445,7 @@ settingsFromRepoTemplatePath (RepoTemplatePath GitHub user name) = do
           basicAuthMsg altGitHubTokenEnvVar
           pure $ Just (gitHubBasicAuthType, fromString wantAltGitHubToken)
         else pure Nothing
-  pure $ TemplateDownloadSettings
+  pure TemplateDownloadSettings
     { tplDownloadUrl = concat
         [ "https://api.github.com/repos/"
         , T.unpack user