Skip to content

Commit da44f86

Browse files
BlaisorbladeBlaisorblade
committed
Remove Stack.Types to speedup builds
Fix commercialhaskell#2405.
1 parent 0628ff1 commit da44f86

49 files changed

Lines changed: 220 additions & 72 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/Control/Concurrent/Execute.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import Data.Set (Set)
2020
import qualified Data.Set as Set
2121
import Data.Typeable (Typeable)
2222
import Prelude -- Fix AMP warning
23-
import Stack.Types
23+
import Stack.Types.PackageIdentifier
2424

2525
data ActionType
2626
= ATBuild

‎src/Stack/Build.hs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,13 @@ import Stack.Build.Target
6060
import Stack.Fetch as Fetch
6161
import Stack.GhcPkg
6262
import Stack.Package
63-
import Stack.Types
63+
import Stack.Types.FlagName
64+
import Stack.Types.PackageIdentifier
65+
import Stack.Types.PackageName
66+
import Stack.Types.Version
67+
import Stack.Types.Config
68+
import Stack.Types.Build
69+
import Stack.Types.Package
6470
import Stack.Types.Internal
6571
import System.FileLock (FileLock, unlockFile)
6672

‎src/Stack/Build/Cache.hs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,12 @@ import GHC.Generics (Generic)
6565
import Path
6666
import Path.IO
6767
import Stack.Constants
68-
import Stack.Types
68+
import Stack.Types.GhcPkgId
69+
import Stack.Types.PackageIdentifier
70+
import Stack.Types.Version
71+
import Stack.Types.Config
72+
import Stack.Types.Build
73+
import Stack.Types.Compiler
6974
import qualified System.FilePath as FilePath
7075

7176
-- | Directory containing files to mark an executable as installed

‎src/Stack/Build/ConstructPlan.hs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,14 @@ import Stack.BuildPlan
4747
import Stack.Package
4848
import Stack.PackageDump
4949
import Stack.PackageIndex
50-
import Stack.Types
50+
import Stack.Types.FlagName
51+
import Stack.Types.GhcPkgId
52+
import Stack.Types.PackageIdentifier
53+
import Stack.Types.PackageName
54+
import Stack.Types.Version
55+
import Stack.Types.Config
56+
import Stack.Types.Build
57+
import Stack.Types.Package
5158

5259
data PackageInfo
5360
= PIOnlyInstalled InstallLocation Installed

‎src/Stack/Build/Execute.hs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,14 @@ import Stack.Fetch as Fetch
7878
import Stack.GhcPkg
7979
import Stack.Package
8080
import Stack.PackageDump
81-
import Stack.Types
81+
import Stack.Types.GhcPkgId
82+
import Stack.Types.PackageIdentifier
83+
import Stack.Types.PackageName
84+
import Stack.Types.Version
85+
import Stack.Types.Config
86+
import Stack.Types.Build
87+
import Stack.Types.Package
88+
import Stack.Types.Compiler
8289
import Stack.Types.Internal
8390
import Stack.Types.StackT
8491
import qualified System.Directory as D

‎src/Stack/Build/Haddock.hs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,13 @@ import Path.Extra
4242
import Path.IO
4343
import Prelude
4444
import Stack.PackageDump
45-
import Stack.Types
45+
import Stack.Types.GhcPkgId
46+
import Stack.Types.PackageIdentifier
47+
import Stack.Types.PackageName
48+
import Stack.Types.Config
49+
import Stack.Types.Build
50+
import Stack.Types.Package
51+
import Stack.Types.Compiler
4652
import qualified System.FilePath as FP
4753
import System.IO.Error (isDoesNotExistError)
4854
import System.Process.Read

‎src/Stack/Build/Installed.hs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,12 @@ import Stack.Types.Version
4040
import Stack.Constants
4141
import Stack.GhcPkg
4242
import Stack.PackageDump
43-
import Stack.Types
43+
import Stack.Types.GhcPkgId
44+
import Stack.Types.PackageIdentifier
45+
import Stack.Types.PackageName
46+
import Stack.Types.Config
47+
import Stack.Types.Package
48+
import Stack.Types.Compiler
4449
import Stack.Types.Internal
4550

4651
type M env m = (MonadIO m,MonadReader env m,HasHttpManager env,HasEnvConfig env,MonadLogger m,MonadBaseControl IO m,MonadMask m,HasLogLevel env)

‎src/Stack/Build/Source.hs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,13 @@ import Stack.BuildPlan (shadowMiniBuildPlan)
6464
import Stack.Constants (wiredInPackages)
6565
import Stack.Package
6666
import Stack.PackageIndex (getPackageVersions)
67-
import Stack.Types
67+
import Stack.Types.BuildPlan
68+
import Stack.Types.FlagName
69+
import Stack.Types.PackageName
70+
import Stack.Types.Version
71+
import Stack.Types.Config
72+
import Stack.Types.Build
73+
import Stack.Types.Package
6874
import qualified System.Directory as D
6975
import System.FilePath (takeFileName)
7076
import System.IO (withBinaryFile, IOMode (ReadMode))

‎src/Stack/Build/Target.hs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,12 @@ import Path
3939
import Path.Extra (rejectMissingDir)
4040
import Path.IO
4141
import Prelude hiding (concat, concatMap) -- Fix redundant import warnings
42-
import Stack.Types
42+
import Stack.Types.PackageIdentifier
43+
import Stack.Types.PackageName
44+
import Stack.Types.Version
45+
import Stack.Types.Config
46+
import Stack.Types.Build
47+
import Stack.Types.Package
4348

4449
-- | The name of a component, which applies to executables, test suites, and benchmarks
4550
type ComponentName = Text

‎src/Stack/BuildPlan.hs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,15 @@ import Stack.Constants
8484
import Stack.Fetch
8585
import Stack.Package
8686
import Stack.PackageIndex
87-
import Stack.Types
87+
import Stack.Types.BuildPlan
88+
import Stack.Types.FlagName
89+
import Stack.Types.PackageIdentifier
90+
import Stack.Types.PackageIndex
91+
import Stack.Types.PackageName
92+
import Stack.Types.Version
93+
import Stack.Types.Config
94+
import Stack.Types.Urls
95+
import Stack.Types.Compiler
8896
import Stack.Types.StackT
8997

9098
data BuildPlanException

0 commit comments

Comments
 (0)