Move ArchiveResult into GHCup.Utils.Tar.Types

So a module that wants to import ArchiveResult doesn't have to worry about CPP.
This commit is contained in:
Rune K. Svendsen
2024-01-09 10:19:58 +01:00
parent 2ece023c0f
commit 87ec8c756f
5 changed files with 37 additions and 26 deletions

View File

@@ -29,14 +29,10 @@ module GHCup.Types
where
import GHCup.Types.Stack ( SetupInfo )
import GHCup.Utils.Tar.Types ( ArchiveResult(..) )
import {-# SOURCE #-} GHCup.Utils.Dirs ( fromGHCupPath, GHCupPath )
import Control.DeepSeq ( NFData, rnf )
#if defined(TAR)
import Control.Exception ( Exception )
#else
import Codec.Archive ( ArchiveResult(..) )
#endif
import Data.Map.Strict ( Map )
import Data.List.NonEmpty ( NonEmpty (..) )
import Data.Time.Calendar ( Day )
@@ -781,19 +777,3 @@ instance Pretty ToolVersion where
data BuildSystem = Hadrian
| Make
deriving (Show, Eq)
#if defined(TAR)
data ArchiveResult = ArchiveFatal
| ArchiveFailed
| ArchiveWarn
| ArchiveRetry
| ArchiveOk
| ArchiveEOF
deriving (Eq, Show, GHC.Generic)
instance NFData ArchiveResult
instance Exception ArchiveResult
#endif