Merge pull request #6599 from phadej/split-client-types

Split D.Client.Types module

Author: phadej

cabal-install/Distribution/Client/Config.hs

@@ -51,10 +51,11 @@ import Distribution.Deprecated.ViewAsFieldDescr
          ( viewAsFieldDescr )
 
 import Distribution.Client.Types
-         ( RemoteRepo(..), LocalRepo (..), Username(..), Password(..), emptyRemoteRepo
+         ( RemoteRepo(..), LocalRepo (..), emptyRemoteRepo
          , AllowOlder(..), AllowNewer(..), RelaxDeps(..), isRelaxDeps
          , RepoName (..), unRepoName
          )
+import Distribution.Client.Types.Credentials (Username (..), Password (..))
 import Distribution.Client.BuildReports.Types
          ( ReportLevel(..) )
 import qualified Distribution.Client.Init.Types as IT

cabal-install/Distribution/Client/Get.hs

@@ -41,7 +41,7 @@ import qualified Distribution.PackageDescription as PD
 import Distribution.Simple.Program
          ( programName )
 import Distribution.Types.SourceRepo (RepoKind (..))
-import Distribution.Client.SourceRepo (SourceRepositoryPackage (..), SourceRepoProxy, srpToProxy)
+import Distribution.Client.Types.SourceRepo (SourceRepositoryPackage (..), SourceRepoProxy, srpToProxy)
 
 import Distribution.Client.Setup
          ( GlobalFlags(..), GetFlags(..), RepoContext(..) )

cabal-install/Distribution/Client/IndexUtils/IndexState.hs

@@ -19,14 +19,14 @@ module Distribution.Client.IndexUtils.IndexState (
 
 import Distribution.Client.Compat.Prelude
 import Distribution.Client.IndexUtils.Timestamp (Timestamp)
-import Distribution.Client.Types                (RepoName (..))
+import Distribution.Client.Types.RepoName       (RepoName (..))
 
 import Distribution.FieldGrammar.Described
 import Distribution.Parsec                 (Parsec (..))
 import Distribution.Pretty                 (Pretty (..))
 
+import qualified Data.Map.Strict                 as Map
 import qualified Distribution.Compat.CharParsing as P
-import qualified Data.Map.Strict as Map
 import qualified Text.PrettyPrint                as Disp
 
 -------------------------------------------------------------------------------

cabal-install/Distribution/Client/ProjectConfig.hs

@@ -103,7 +103,7 @@ import Distribution.Fields
 import Distribution.Pretty (prettyShow)
 import Distribution.Types.SourceRepo
          ( RepoType(..) )
-import Distribution.Client.SourceRepo
+import Distribution.Client.Types.SourceRepo
          ( SourceRepoList, SourceRepositoryPackage (..), srpFanOut )
 import Distribution.Simple.Compiler
          ( Compiler, compilerInfo )

cabal-install/Distribution/Client/ProjectConfig/Legacy.hs

@@ -26,10 +26,10 @@ import Distribution.Client.Compat.Prelude
 import Distribution.Deprecated.ParseUtils (parseFlagAssignment)
 
 import Distribution.Client.ProjectConfig.Types
-import Distribution.Client.Types
-         ( RepoName (..), RemoteRepo(..), LocalRepo (..), emptyRemoteRepo
-         , AllowNewer(..), AllowOlder(..), unRepoName )
-import Distribution.Client.SourceRepo (sourceRepositoryPackageGrammar, SourceRepoList)
+import Distribution.Client.Types.RepoName (RepoName (..), unRepoName)
+import Distribution.Client.Types.Repo (RemoteRepo(..), LocalRepo (..), emptyRemoteRepo)
+import Distribution.Client.Types.AllowNewer (AllowNewer(..), AllowOlder(..))
+import Distribution.Client.Types.SourceRepo (sourceRepositoryPackageGrammar, SourceRepoList)
 
 import Distribution.Client.Config
          ( SavedConfig(..), remoteRepoFields, postProcessRepo )

cabal-install/Distribution/Client/ProjectConfig/Types.hs

@@ -23,16 +23,16 @@ module Distribution.Client.ProjectConfig.Types (
 import Distribution.Client.Compat.Prelude
 import Prelude ()
 
-import Distribution.Client.Types
-         ( RemoteRepo, LocalRepo, AllowNewer(..), AllowOlder(..)
-         , WriteGhcEnvironmentFilesPolicy )
+import Distribution.Client.Types.Repo ( RemoteRepo, LocalRepo )
+import Distribution.Client.Types.AllowNewer ( AllowNewer(..), AllowOlder(..) )
+import Distribution.Client.Types.WriteGhcEnvironmentFilesPolicy ( WriteGhcEnvironmentFilesPolicy )
 import Distribution.Client.Dependency.Types
          ( PreSolver )
 import Distribution.Client.Targets
          ( UserConstraint )
 import Distribution.Client.BuildReports.Types
          ( ReportLevel(..) )
-import Distribution.Client.SourceRepo (SourceRepoList)
+import Distribution.Client.Types.SourceRepo (SourceRepoList)
 
 import Distribution.Client.IndexUtils.IndexState
          ( TotalIndexState )

cabal-install/Distribution/Client/ProjectPlanOutput.hs

@@ -18,9 +18,11 @@ module Distribution.Client.ProjectPlanOutput (
 import           Distribution.Client.ProjectPlanning.Types
 import           Distribution.Client.ProjectBuilding.Types
 import           Distribution.Client.DistDirLayout
-import           Distribution.Client.Types (Repo(..), RemoteRepo(..), PackageLocation(..), confInstId)
+import           Distribution.Client.Types.Repo (Repo(..), RemoteRepo(..))
+import           Distribution.Client.Types.PackageLocation (PackageLocation(..))
+import           Distribution.Client.Types.ConfiguredId (confInstId)
+import           Distribution.Client.Types.SourceRepo (SourceRepoMaybe, SourceRepositoryPackage (..))
 import           Distribution.Client.HashValue (showHashValue, hashValue)
-import           Distribution.Client.SourceRepo (SourceRepoMaybe, SourceRepositoryPackage (..))
 
 import qualified Distribution.Client.InstallPlan as InstallPlan
 import qualified Distribution.Client.Utils.Json as J

cabal-install/Distribution/Client/Setup.hs

@@ -67,12 +67,11 @@ import Distribution.Client.Compat.Prelude hiding (get)
 
 import Distribution.Deprecated.ReadP (readP_to_E)
 
-import Distribution.Client.Types
-         ( Username(..), Password(..), RemoteRepo(..)
-         , LocalRepo (..)
-         , AllowNewer(..), AllowOlder(..), RelaxDeps(..)
-         , WriteGhcEnvironmentFilesPolicy(..)
-         )
+import Distribution.Client.Types.Credentials (Username (..), Password (..))
+import Distribution.Client.Types.Repo (RemoteRepo(..), LocalRepo (..))
+import Distribution.Client.Types.AllowNewer (AllowNewer(..), AllowOlder(..), RelaxDeps(..))
+import Distribution.Client.Types.WriteGhcEnvironmentFilesPolicy
+
 import Distribution.Client.BuildReports.Types
          ( ReportLevel(..) )
 import Distribution.Client.Dependency.Types