refactor(cabal-install): separate GenericReadyPackage from ReadyPackage

Author: andreabedini

cabal-install/cabal-install.cabal

@@ -221,6 +221,7 @@ library
         Distribution.Client.Types.ConfiguredId
         Distribution.Client.Types.ConfiguredPackage
         Distribution.Client.Types.Credentials
+        Distribution.Client.Types.GenericReadyPackage
         Distribution.Client.Types.InstallMethod
         Distribution.Client.Types.OverwritePolicy
         Distribution.Client.Types.PackageLocation

cabal-install/src/Distribution/Client/Configure.hs

@@ -52,7 +52,7 @@ import Distribution.Client.Targets
   , userToPackageConstraint
   )
 import Distribution.Client.Types as Source
-
+import Distribution.Client.Types.ReadyPackage (ReadyPackage)
 import qualified Distribution.Solver.Types.ComponentDeps as CD
 import Distribution.Solver.Types.ConstraintSource
 import Distribution.Solver.Types.LabeledPackageConstraint

cabal-install/src/Distribution/Client/Install.hs

@@ -126,6 +126,7 @@ import Distribution.Client.Tar (extractTarGzFile)
 import Distribution.Client.Targets
 import Distribution.Client.Types as Source
 import Distribution.Client.Types.OverwritePolicy (OverwritePolicy (..))
+import Distribution.Client.Types.ReadyPackage (ReadyPackage)
 import qualified Distribution.Client.Win32SelfUpgrade as Win32SelfUpgrade
 import qualified Distribution.InstalledPackageInfo as Installed
 import Distribution.Solver.Types.PackageFixedDeps

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

@@ -22,7 +22,7 @@ module Distribution.Client.Types
   , module Distribution.Client.Types.BuildResults
   , module Distribution.Client.Types.PackageLocation
   , module Distribution.Client.Types.PackageSpecifier
-  , module Distribution.Client.Types.ReadyPackage
+  , module Distribution.Client.Types.GenericReadyPackage
   , module Distribution.Client.Types.Repo
   , module Distribution.Client.Types.RepoName
   , module Distribution.Client.Types.SourcePackageDb
@@ -33,9 +33,9 @@ import Distribution.Client.Types.AllowNewer
 import Distribution.Client.Types.BuildResults
 import Distribution.Client.Types.ConfiguredId
 import Distribution.Client.Types.ConfiguredPackage
+import Distribution.Client.Types.GenericReadyPackage
 import Distribution.Client.Types.PackageLocation
 import Distribution.Client.Types.PackageSpecifier
-import Distribution.Client.Types.ReadyPackage
 import Distribution.Client.Types.Repo
 import Distribution.Client.Types.RepoName
 import Distribution.Client.Types.SourcePackageDb

cabal-install/src/Distribution/Client/Types/GenericReadyPackage.hs

@@ -0,0 +1,36 @@
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TypeFamilies #-}
+
+module Distribution.Client.Types.GenericReadyPackage
+  ( GenericReadyPackage (..)
+  ) where
+
+import Distribution.Client.Compat.Prelude
+import Prelude ()
+
+import Distribution.Compat.Graph (IsNode (..))
+import Distribution.Package (HasMungedPackageId, HasUnitId, Package, PackageInstalled)
+
+import Distribution.Solver.Types.PackageFixedDeps
+
+-- | Like 'ConfiguredPackage', but with all dependencies guaranteed to be
+-- installed already, hence itself ready to be installed.
+newtype GenericReadyPackage srcpkg = ReadyPackage srcpkg -- see 'ConfiguredPackage'.
+  deriving
+    ( Eq
+    , Show
+    , Generic
+    , Package
+    , PackageFixedDeps
+    , HasMungedPackageId
+    , HasUnitId
+    , PackageInstalled
+    , Binary
+    )
+
+-- Can't newtype derive this
+instance IsNode srcpkg => IsNode (GenericReadyPackage srcpkg) where
+  type Key (GenericReadyPackage srcpkg) = Key srcpkg
+  nodeKey (ReadyPackage spkg) = nodeKey spkg
+  nodeNeighbors (ReadyPackage spkg) = nodeNeighbors spkg

cabal-install/src/Distribution/Client/Types/ReadyPackage.hs

@@ -1,41 +1,10 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE TypeFamilies #-}
-
 module Distribution.Client.Types.ReadyPackage
   ( GenericReadyPackage (..)
   , ReadyPackage
   ) where
 
-import Distribution.Client.Compat.Prelude
-import Prelude ()
-
-import Distribution.Compat.Graph (IsNode (..))
-import Distribution.Package (HasMungedPackageId, HasUnitId, Package, PackageInstalled)
-
 import Distribution.Client.Types.ConfiguredPackage (ConfiguredPackage)
+import Distribution.Client.Types.GenericReadyPackage (GenericReadyPackage (..))
 import Distribution.Client.Types.PackageLocation (UnresolvedPkgLoc)
-import Distribution.Solver.Types.PackageFixedDeps
-
--- | Like 'ConfiguredPackage', but with all dependencies guaranteed to be
--- installed already, hence itself ready to be installed.
-newtype GenericReadyPackage srcpkg = ReadyPackage srcpkg -- see 'ConfiguredPackage'.
-  deriving
-    ( Eq
-    , Show
-    , Generic
-    , Package
-    , PackageFixedDeps
-    , HasMungedPackageId
-    , HasUnitId
-    , PackageInstalled
-    , Binary
-    )
-
--- Can't newtype derive this
-instance IsNode srcpkg => IsNode (GenericReadyPackage srcpkg) where
-  type Key (GenericReadyPackage srcpkg) = Key srcpkg
-  nodeKey (ReadyPackage spkg) = nodeKey spkg
-  nodeNeighbors (ReadyPackage spkg) = nodeNeighbors spkg
 
 type ReadyPackage = GenericReadyPackage (ConfiguredPackage UnresolvedPkgLoc)