Re #2407 Move exceptions out of Stack.Types.Config

commercialhaskell · Apr 19, 2023 · c0cdfbc · c0cdfbc
1 parent 34bef88
commit c0cdfbc
Show file tree

Hide file tree

Showing 7 changed files with 323 additions and 310 deletions.
diff --git a/package.yaml b/package.yaml
@@ -271,6 +271,7 @@ library:
   - Stack.Types.Compiler
   - Stack.Types.Config
   - Stack.Types.Config.Build
+  - Stack.Types.Config.Exception
   - Stack.Types.ConfigMonoid
   - Stack.Types.Docker
   - Stack.Types.DockerEntrypoint

diff --git a/src/Stack/Config.hs b/src/Stack/Config.hs
@@ -104,13 +104,14 @@ import           Stack.Types.ColorWhen ( ColorWhen (..) )
 import           Stack.Types.Compiler ( defaultCompilerRepository )
 import           Stack.Types.Config
                    ( BuildConfig (..), BuildOpts (..), Config (..)
-                   , ConfigException (..), ConfigPrettyException (..)
-                   , HasConfig (..), ParseAbsolutePathException (..)
-                   , Project (..), ProjectAndConfigMonoid (..)
+                   , HasConfig (..), Project (..), ProjectAndConfigMonoid (..)
                    , ProjectConfig (..), askLatestSnapshotUrl, configProjectRoot
-                   , packageIndicesWarning, parseProjectAndConfigMonoid
-                   , platformOnlyRelDir, stackRootL, workDirL
+                   , parseProjectAndConfigMonoid, platformOnlyRelDir, stackRootL
+                   , workDirL
                    )
+import           Stack.Types.Config.Exception
+                   ( ConfigException (..), ConfigPrettyException (..)
+                   , ParseAbsolutePathException (..), packageIndicesWarning )
 import           Stack.Types.ConfigMonoid
                    ( ConfigMonoid (..), parseConfigMonoid )
 import           Stack.Types.Docker ( DockerOptsMonoid (..), dockerEnable )

diff --git a/src/Stack/Init.hs b/src/Stack/Init.hs
@@ -47,10 +47,8 @@ import           Stack.Runners
                    ( ShouldReexec (..), withConfig, withGlobalProject )
 import           Stack.SourceMap
                    ( SnapshotCandidate, loadProjectSnapshotCandidate )
-import           Stack.Types.Config
-                   ( ConfigPrettyException (..), HasConfig, HasGHCVariant
-                   , Project (..)
-                   )
+import           Stack.Types.Config ( HasConfig, HasGHCVariant, Project (..) )
+import           Stack.Types.Config.Exception ( ConfigPrettyException (..) )
 import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
 import           Stack.Types.Runner (Runner, globalOptsL )
 import           Stack.Types.Resolver ( AbstractResolver, Snapshots (..) )

diff --git a/src/Stack/Lock.hs b/src/Stack/Lock.hs
@@ -24,7 +24,7 @@ import           Path.Extended ( addExtension )
 import           Path.IO ( doesFileExist )
 import           Stack.Prelude
 import           Stack.SourceMap ( snapToDepPackage )
-import           Stack.Types.Config ( ConfigPrettyException (..) )
+import           Stack.Types.Config.Exception ( ConfigPrettyException (..) )
 import           Stack.Types.LockFileBehavior ( LockFileBehavior (..) )
 import           Stack.Types.Runner ( HasRunner, lockFileBehaviorL, rslInLogL )
 import           Stack.Types.SourceMap ( DepPackage, SMWanted )