Set up the Stack.Types hierarchy

snoyberg · snoyberg · commit aea28f7f771a · 2015-05-18T13:14:12.000+03:00
diff --git a/src/Stack/Build.hs b/src/Stack/Build.hs
@@ -64,18 +64,13 @@ import           Stack.Constants
 import           Stack.Build.Doc
 import           Stack.Build.Types
 import           Stack.BuildPlan
-import           Stack.BuildPlan.Types
+import           Stack.Types
 import           Stack.Config
 import           Stack.Fetch as Fetch
-import           Stack.FlagName
 import           Stack.GhcPkg
-import           Stack.GhcPkgId
 import           Stack.Package
-import           Stack.PackageIdentifier
 import           Stack.PackageIndex.Read
 import           Stack.PackageIndex.Update
-import           Stack.PackageName
-import           Stack.Version
 import           System.Directory hiding (findFiles)
 import           System.Environment
 import qualified System.FilePath as FilePath
diff --git a/src/Stack/Build/Doc.hs b/src/Stack/Build/Doc.hs
@@ -14,8 +14,7 @@ import           Data.Maybe
 import qualified Data.Text as T
 import           Path as FL
 import           Stack.Constants
-import           Stack.PackageName
-import           Stack.Version
+import           Stack.Types
 import           System.Directory
 import           System.FilePath (takeFileName)
 
diff --git a/src/Stack/Build/Types.hs b/src/Stack/Build/Types.hs
@@ -23,12 +23,8 @@ import Development.Shake (Verbosity)
 import Distribution.Package hiding (Package,PackageName)
 import GHC.Generics
 import Prelude hiding (FilePath)
-import Stack.BuildPlan.Types
-import Stack.FlagName
-import Stack.GhcPkgId
+import Stack.Types
 import Stack.Package
-import Stack.PackageName
-import Stack.Version
 
 data StackageBuildException
   = FPNoConfigFile
diff --git a/src/Stack/BuildPlan.hs b/src/Stack/BuildPlan.hs
@@ -56,12 +56,9 @@ import           Network.HTTP.Client             (Manager, parseUrl,
                                                   responseBody, withResponse)
 import           Network.HTTP.Client.Conduit     (bodyReaderSource)
 import           Path
-import           Stack.BuildPlan.Types
+import           Stack.Types
 import           Stack.Constants
-import           Stack.FlagName
 import           Stack.Package
-import           Stack.PackageName
-import           Stack.Version
 import           System.Directory                (createDirectoryIfMissing,
                                                   getAppUserDataDirectory)
 import           System.FilePath                 (takeDirectory)
diff --git a/src/Stack/Config.hs b/src/Stack/Config.hs
@@ -71,8 +71,7 @@ import           Data.Typeable
 import qualified Data.Yaml as Yaml
 import           Path
 import           Path.Find
-import           Stack.FlagName
-import           Stack.PackageName
+import           Stack.Types
 import           System.Directory
 import           System.Environment
 import           System.Process
diff --git a/src/Stack/Fetch.hs b/src/Stack/Fetch.hs
@@ -19,9 +19,7 @@ module Stack.Fetch
     ) where
 
 import           Control.Monad.IO.Class
-import           Stack.PackageIdentifier
-import           Stack.PackageName
-import           Stack.Version
+import           Stack.Types
 
 import qualified Codec.Archive.Tar as Tar
 import           Control.Applicative ((*>), (<$>), (<*>))
diff --git a/src/Stack/GhcPkg.hs b/src/Stack/GhcPkg.hs
@@ -12,10 +12,7 @@ module Stack.GhcPkg
   ,getPackageIds)
   where
 
-import           Stack.GhcPkgId
-import           Stack.PackageIdentifier
-import           Stack.PackageName
-import           Stack.Version
+import           Stack.Types
 import           Stack.Process
 
 import           Control.Applicative
diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
@@ -53,9 +53,7 @@ import           Path as FL
 import           Path.Find (findFiles)
 import           Prelude hiding (FilePath)
 import           Stack.Constants
-import           Stack.FlagName
-import           Stack.PackageName
-import           Stack.Version
+import           Stack.Types
 import           System.Directory (doesFileExist)
 import qualified System.FilePath as FilePath
 
diff --git a/src/Stack/PackageIndex/Read.hs b/src/Stack/PackageIndex/Read.hs
@@ -37,8 +37,7 @@ import           Distribution.PackageDescription.Parse (ParseResult (..), parseP
 import           Distribution.ParseUtils (PError)
 import qualified Distribution.Text as DT
 import           Path hiding ((</>))
-import           Stack.PackageName
-import           Stack.Version
+import           Stack.Types
 import           System.Directory (getAppUserDataDirectory)
 import qualified Data.Conduit.List as CL
 import Control.Monad.Trans.Class (lift)
diff --git a/src/Stack/PackageIndex/Update.hs b/src/Stack/PackageIndex/Update.hs
@@ -45,8 +45,7 @@ import           Path
        (Path, Abs, Dir, toFilePath, parseAbsDir, parseAbsFile, mkRelFile,
         mkRelDir, (</>))
 import           Control.Exception.Enclosed (tryIO)
-import           Stack.PackageName (PackageName, packageNameString)
-import           Stack.Version (Version, parseVersionFromString)
+import           Stack.Types
 import           Stack.Process (runIn)
 import           Stack.Constants
 import           System.Directory
diff --git a/src/Stack/Types.hs b/src/Stack/Types.hs
@@ -1,13 +1,12 @@
 -- | All types.
 
 module Stack.Types
-  (PackageName
-  ,Version
-  ,PackageIdentifier
-  ,GhcPkgId)
+  (module X)
   where
 
-import Stack.PackageName
-import Stack.Version
-import Stack.PackageIdentifier
-import Stack.GhcPkgId
+import Stack.Types.BuildPlan as X
+import Stack.Types.FlagName as X
+import Stack.Types.GhcPkgId as X
+import Stack.Types.PackageIdentifier as X
+import Stack.Types.PackageName as X
+import Stack.Types.Version as X
diff --git a/src/Stack/Types/BuildPlan.hs b/src/Stack/Types/BuildPlan.hs
@@ -4,7 +4,7 @@
 {-# LANGUAGE RecordWildCards            #-}
 {-# LANGUAGE FlexibleInstances          #-}
 -- | Shared types for various stackage packages.
-module Stack.BuildPlan.Types
+module Stack.Types.BuildPlan
     ( -- * Types
       BuildPlan (..)
     , PackagePlan (..)
@@ -44,13 +44,13 @@ import           Data.Time                       (Day)
 import qualified Data.Traversable                as T
 import           Data.Typeable                   (TypeRep, Typeable, typeOf)
 import           Data.Vector                     (Vector)
-import Stack.PackageName
-import Stack.FlagName
 import           Distribution.System             (Arch, OS)
 import qualified Distribution.Text               as DT
-import           Stack.Version                   (Version, VersionRange)
 import qualified Distribution.Version            as C
-import Safe (readMay)
+import           Safe (readMay)
+import           Stack.Types.FlagName
+import           Stack.Types.PackageName
+import           Stack.Types.Version
 
 -- | The name of an LTS Haskell or Stackage Nightly snapshot.
 data SnapName
diff --git a/src/Stack/Types/FlagName.hs b/src/Stack/Types/FlagName.hs
@@ -8,7 +8,7 @@
 
 -- | Names for flags.
 
-module Stack.FlagName
+module Stack.Types.FlagName
   (FlagName
   ,FlagNameParseFail(..)
   ,flagNameParser
diff --git a/src/Stack/Types/GhcPkgId.hs b/src/Stack/Types/GhcPkgId.hs
@@ -4,7 +4,7 @@
 
 -- | A ghc-pkg id.
 
-module Stack.GhcPkgId
+module Stack.Types.GhcPkgId
   (GhcPkgId
   ,parseGhcPkgIdFromString)
   where
diff --git a/src/Stack/Types/PackageIdentifier.hs b/src/Stack/Types/PackageIdentifier.hs
@@ -4,7 +4,7 @@
 
 -- | Package identifier (name-version).
 
-module Stack.PackageIdentifier
+module Stack.Types.PackageIdentifier
   (PackageIdentifier(..)
   ,toTuple
   ,fromTuple
@@ -19,8 +19,8 @@ import Data.Data
 import Data.Hashable
 import GHC.Generics
 import Prelude hiding (FilePath)
-import Stack.PackageName
-import Stack.Version
+import Stack.Types.PackageName
+import Stack.Types.Version
 
 -- | A pkg-ver combination.
 data PackageIdentifier =
diff --git a/src/Stack/Types/PackageName.hs b/src/Stack/Types/PackageName.hs
@@ -8,7 +8,7 @@
 
 -- | Names for packages.
 
-module Stack.PackageName
+module Stack.Types.PackageName
   (PackageName
   ,PackageNameParseFail(..)
   ,packageNameParser
diff --git a/src/Stack/Types/Version.hs b/src/Stack/Types/Version.hs
@@ -7,7 +7,7 @@
 
 -- | Versions for packages.
 
-module Stack.Version
+module Stack.Types.Version
   (Version
   ,Cabal.VersionRange -- FIXME in the future should have a newtype wrapper
   ,versionParser
diff --git a/stack.cabal b/stack.cabal
@@ -15,23 +15,23 @@ library
   hs-source-dirs:    src/
   ghc-options:       -Wall -O2
   exposed-modules:   Stack.BuildPlan
-                     Stack.BuildPlan.Types
                      Stack.Config
                      Stack.Constants
                      Stack.Docker
                      Stack.Docker.GlobalDB
                      Stack.Fetch
-                     Stack.FlagName
                      Stack.GhcPkg
-                     Stack.GhcPkgId
                      Stack.Package
-                     Stack.PackageIdentifier
                      Stack.PackageIndex.Read
                      Stack.PackageIndex.Update
-                     Stack.PackageName
-                     Stack.Version
                      Stack.Path
                      Stack.Types
+                     Stack.Types.BuildPlan
+                     Stack.Types.FlagName
+                     Stack.Types.GhcPkgId
+                     Stack.Types.PackageIdentifier
+                     Stack.Types.PackageName
+                     Stack.Types.Version
                      Stack.Build
                      Stack.Build.Types
                      Stack.Build.Doc
