Merge pull request #4364 from Ericson2314/break-up-dist-package

Break up Distribution.Package -- only classes and reexports remain
haskell · Mar 3, 2017 · 15c935a · 15c935a
2 parents cef856f + eebf36b
commit 15c935a
Show file tree

Hide file tree

Showing 46 changed files with 543 additions and 399 deletions.
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -206,6 +206,7 @@ library
     Distribution.System
     Distribution.TestSuite
     Distribution.Text
+    Distribution.Types.AbiHash
     Distribution.Types.Benchmark
     Distribution.Types.BenchmarkInterface
     Distribution.Types.BenchmarkType
@@ -214,23 +215,30 @@ library
     Distribution.Types.ComponentInclude
     Distribution.Types.Dependency
     Distribution.Types.ExeDependency
-    Distribution.Types.DependencyMap
     Distribution.Types.LegacyExeDependency
     Distribution.Types.PkgconfigDependency
+    Distribution.Types.DependencyMap
+    Distribution.Types.ComponentId
+    Distribution.Types.PackageId
+    Distribution.Types.UnitId
     Distribution.Types.Executable
     Distribution.Types.Library
     Distribution.Types.ForeignLib
     Distribution.Types.ForeignLibType
     Distribution.Types.ForeignLibOption
+    Distribution.Types.Module
     Distribution.Types.ModuleReexport
     Distribution.Types.ModuleRenaming
+    Distribution.Types.ComponentName
+    Distribution.Types.PackageName
+    Distribution.Types.PkgconfigName
+    Distribution.Types.UnqualComponentName
     Distribution.Types.IncludeRenaming
     Distribution.Types.Mixin
     Distribution.Types.SetupBuildInfo
     Distribution.Types.TestSuite
     Distribution.Types.TestSuiteInterface
     Distribution.Types.TestType
-    Distribution.Types.ComponentName
     Distribution.Types.GenericPackageDescription
     Distribution.Types.Condition
     Distribution.Types.CondTree
@@ -242,7 +250,6 @@ library
     Distribution.Types.LocalBuildInfo
     Distribution.Types.ComponentRequestedSpec
     Distribution.Types.TargetInfo
-    Distribution.Types.UnqualComponentName
     Distribution.Utils.Generic
     Distribution.Utils.NubList
     Distribution.Utils.ShortText

diff --git a/Cabal/Distribution/Backpack.hs b/Cabal/Distribution/Backpack.hs
@@ -46,8 +46,10 @@ import qualified Text.PrettyPrint as Disp
 import Text.PrettyPrint (hcat)
 
 import Distribution.ModuleName
-import Distribution.Package
 import Distribution.Text
+import Distribution.Types.ComponentId
+import Distribution.Types.UnitId
+import Distribution.Types.Module
 import Distribution.Utils.Base62
 
 import qualified Data.Map as Map

diff --git a/Cabal/Distribution/Backpack/ConfiguredComponent.hs b/Cabal/Distribution/Backpack/ConfiguredComponent.hs
@@ -21,6 +21,9 @@ import Distribution.Backpack.Id
 
 import Distribution.Types.Dependency
 import Distribution.Types.IncludeRenaming
+import Distribution.Types.ComponentId
+import Distribution.Types.PackageId
+import Distribution.Types.PackageName
 import Distribution.Types.Mixin
 import Distribution.Types.UnqualComponentName
 import Distribution.Types.ComponentInclude

diff --git a/Cabal/Distribution/Backpack/DescribeUnitId.hs b/Cabal/Distribution/Backpack/DescribeUnitId.hs
@@ -5,11 +5,11 @@ module Distribution.Backpack.DescribeUnitId where
 import Prelude ()
 import Distribution.Compat.Prelude
 
+import Distribution.Types.PackageId
 import Distribution.Types.ComponentName
 import Distribution.Compat.Stack
 import Distribution.Verbosity
 import Distribution.ModuleName
-import Distribution.Package
 import Distribution.Text
 import Distribution.Simple.Utils
 

diff --git a/Cabal/Distribution/Backpack/FullUnitId.hs b/Cabal/Distribution/Backpack/FullUnitId.hs
@@ -7,7 +7,7 @@ module Distribution.Backpack.FullUnitId (
 ) where
 
 import Distribution.Backpack
-import Distribution.Package
+import Distribution.Types.ComponentId
 import Distribution.Compat.Prelude
 
 -- Unlike OpenUnitId, which could direct to a UnitId.

diff --git a/Cabal/Distribution/Backpack/Id.hs b/Cabal/Distribution/Backpack/Id.hs
@@ -13,11 +13,14 @@ import Distribution.Compat.Prelude
 
 import Distribution.Types.UnqualComponentName
 import Distribution.Simple.Compiler hiding (Flag)
-import Distribution.Package
 import Distribution.PackageDescription as PD hiding (Flag)
 import Distribution.Simple.Setup as Setup
 import qualified Distribution.Simple.InstallDirs as InstallDirs
 import Distribution.Simple.LocalBuildInfo
+import Distribution.Types.ComponentId
+import Distribution.Types.PackageId
+import Distribution.Types.UnitId
+import Distribution.Types.PackageName
 import Distribution.Utils.Base62
 import Distribution.Version
 

diff --git a/Cabal/Distribution/Backpack/LinkedComponent.hs b/Cabal/Distribution/Backpack/LinkedComponent.hs
@@ -28,6 +28,8 @@ import Distribution.Types.ComponentName
 import Distribution.Types.ModuleRenaming
 import Distribution.Types.IncludeRenaming
 import Distribution.Types.ComponentInclude
+import Distribution.Types.ComponentId
+import Distribution.Types.PackageId
 import Distribution.Package
 import Distribution.PackageDescription as PD hiding (Flag)
 import Distribution.ModuleName

diff --git a/Cabal/Distribution/Backpack/MixLink.hs b/Cabal/Distribution/Backpack/MixLink.hs
@@ -14,7 +14,7 @@ import Distribution.Backpack.FullUnitId
 import qualified Distribution.Utils.UnionFind as UnionFind
 import Distribution.ModuleName
 import Distribution.Text
-import Distribution.Package
+import Distribution.Types.ComponentId
 
 import Text.PrettyPrint
 import Control.Monad

diff --git a/Cabal/Distribution/Backpack/ModuleScope.hs b/Cabal/Distribution/Backpack/ModuleScope.hs
@@ -12,8 +12,8 @@ import Prelude ()
 import Distribution.Compat.Prelude
 
 import Distribution.ModuleName
-import Distribution.Package
 import Distribution.Types.IncludeRenaming
+import Distribution.Types.PackageName
 
 import Distribution.Backpack
 import Distribution.Backpack.ModSubst

diff --git a/Cabal/Distribution/Backpack/PreExistingComponent.hs b/Cabal/Distribution/Backpack/PreExistingComponent.hs
@@ -8,9 +8,12 @@ import Prelude ()
 
 import Distribution.Backpack.ModuleShape
 import Distribution.Backpack
+import Distribution.Types.ComponentId
+import Distribution.Types.PackageId
+import Distribution.Types.UnitId
+import Distribution.Types.PackageName
 
 import qualified Data.Map as Map
-import Distribution.Package
 import qualified Distribution.InstalledPackageInfo as Installed
 import Distribution.InstalledPackageInfo (InstalledPackageInfo)
 

diff --git a/Cabal/Distribution/Backpack/ReadyComponent.hs b/Cabal/Distribution/Backpack/ReadyComponent.hs
@@ -23,7 +23,12 @@ import Distribution.Backpack.ModuleShape
 import Distribution.Types.ModuleRenaming
 import Distribution.Types.Component
 import Distribution.Types.ComponentInclude
+import Distribution.Types.ComponentId
+import Distribution.Types.PackageId
+import Distribution.Types.UnitId
 import Distribution.Compat.Graph (IsNode(..))
+import Distribution.Types.Module
+import Distribution.Types.PackageName
 
 import Distribution.ModuleName
 import Distribution.Package