Skip to content

Commit f988409

Browse files
authored
Remove knowledge about haskell-suite and hmake (#10912)
* Remove knowledge about haskell-suite and hmake These tools haven't existed for at least a decade. * Update hashes in testsuite * Changelog for PR #10912 * Keep knowledge about retired error codes in comment
1 parent 5edaf1b commit f988409

File tree

24 files changed

+14
-410
lines changed

24 files changed

+14
-410
lines changed

Diff for: Cabal-syntax/src/Distribution/Compiler.hs

-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ data CompilerFlavor
7676
| -- | @since 3.12.1.0
7777
-- MicroHS, see https://github.com/augustss/MicroHs
7878
MHS
79-
| HaskellSuite String -- string is the id of the actual compiler
8079
| OtherCompiler String
8180
deriving (Generic, Show, Read, Eq, Ord, Data)
8281

@@ -90,7 +89,6 @@ knownCompilerFlavors =
9089

9190
instance Pretty CompilerFlavor where
9291
pretty (OtherCompiler name) = Disp.text name
93-
pretty (HaskellSuite name) = Disp.text name
9492
pretty NHC = Disp.text "nhc98"
9593
pretty other = Disp.text (lowercase (show other))
9694

Diff for: Cabal-syntax/src/Language/Haskell/Extension.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ classifyLanguage = \str -> case lookup str langTable of
9898

9999
-- * also add it to the Distribution.Simple.X.compilerExtensions lists
100100

101-
-- (where X is each compiler: GHC, UHC, HaskellSuite)
101+
-- (where X is each compiler: GHC, UHC)
102102
--
103103

104104
-- | This represents language extensions beyond a base 'Language' definition

Diff for: Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ md5Check proxy md5Int = structureHash proxy @?= md5FromInteger md5Int
2929

3030
md5CheckGenericPackageDescription :: Proxy GenericPackageDescription -> Assertion
3131
md5CheckGenericPackageDescription proxy = md5Check proxy
32-
0x09251b46ffc5178a7526d31e794d9c62
32+
0xe95038393adbd46b119188757a3a2b63
3333

3434
md5CheckLocalBuildInfo :: Proxy LocalBuildInfo -> Assertion
3535
md5CheckLocalBuildInfo proxy = md5Check proxy
36-
0x8fa7b2c8cc611407bfdcb734ecb460a2
36+
0x906e7b142a02710d412d471a5656769b

Diff for: Cabal/Cabal.cabal

-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ library
126126
Distribution.Simple.Haddock
127127
Distribution.Simple.Glob
128128
Distribution.Simple.Glob.Internal
129-
Distribution.Simple.HaskellSuite
130129
Distribution.Simple.Hpc
131130
Distribution.Simple.Install
132131
Distribution.Simple.InstallDirs

Diff for: Cabal/src/Distribution/Simple/Build.hs

-4
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ import Distribution.Backpack.DescribeUnitId
7272
import Distribution.Package
7373
import qualified Distribution.Simple.GHC as GHC
7474
import qualified Distribution.Simple.GHCJS as GHCJS
75-
import qualified Distribution.Simple.HaskellSuite as HaskellSuite
7675
import qualified Distribution.Simple.PackageIndex as Index
7776
import qualified Distribution.Simple.UHC as UHC
7877

@@ -96,7 +95,6 @@ import Distribution.Simple.Flag
9695
import Distribution.Simple.LocalBuildInfo
9796
import Distribution.Simple.PreProcess
9897
import Distribution.Simple.Program
99-
import Distribution.Simple.Program.Builtin (haskellSuiteProgram)
10098
import Distribution.Simple.Program.Db
10199
import qualified Distribution.Simple.Program.GHC as GHC
102100
import Distribution.Simple.Program.Types
@@ -318,7 +316,6 @@ dumpBuildInfo verbosity distPref dumpBuildInfoFlag pkg_descr lbi flags = do
318316
flavorToProgram GHCJS = Just ghcjsProgram
319317
flavorToProgram UHC = Just uhcProgram
320318
flavorToProgram JHC = Just jhcProgram
321-
flavorToProgram HaskellSuite{} = Just haskellSuiteProgram
322319
flavorToProgram _ = Nothing
323320

324321
repl
@@ -977,7 +974,6 @@ buildLib flags numJobs pkg_descr lbi lib clbi =
977974
GHC -> GHC.buildLib flags numJobs pkg_descr lbi lib clbi
978975
GHCJS -> GHCJS.buildLib verbosity numJobs pkg_descr lbi lib clbi
979976
UHC -> UHC.buildLib verbosity pkg_descr lbi lib clbi
980-
HaskellSuite{} -> HaskellSuite.buildLib verbosity pkg_descr lbi lib clbi
981977
_ -> dieWithException verbosity BuildingNotSupportedWithCompiler
982978

983979
-- | Build a foreign library

Diff for: Cabal/src/Distribution/Simple/Configure.hs

-4
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ import Distribution.Version
119119

120120
import qualified Distribution.Simple.GHC as GHC
121121
import qualified Distribution.Simple.GHCJS as GHCJS
122-
import qualified Distribution.Simple.HaskellSuite as HaskellSuite
123122
import qualified Distribution.Simple.UHC as UHC
124123

125124
import Control.Exception
@@ -2069,8 +2068,6 @@ getInstalledPackages verbosity comp mbWorkDir packageDBs progdb = do
20692068
GHC -> GHC.getInstalledPackages verbosity comp mbWorkDir packageDBs' progdb
20702069
GHCJS -> GHCJS.getInstalledPackages verbosity mbWorkDir packageDBs' progdb
20712070
UHC -> UHC.getInstalledPackages verbosity comp mbWorkDir packageDBs' progdb
2072-
HaskellSuite{} ->
2073-
HaskellSuite.getInstalledPackages verbosity packageDBs' progdb
20742071
flv ->
20752072
dieWithException verbosity $ HowToFindInstalledPackages flv
20762073
where
@@ -2500,7 +2497,6 @@ configCompilerEx (Just hcFlavor) hcPath hcPkg progdb verbosity = do
25002497
GHC -> GHC.configure verbosity hcPath hcPkg progdb
25012498
GHCJS -> GHCJS.configure verbosity hcPath hcPkg progdb
25022499
UHC -> UHC.configure verbosity hcPath hcPkg progdb
2503-
HaskellSuite{} -> HaskellSuite.configure verbosity hcPath hcPkg progdb
25042500
_ -> dieWithException verbosity UnknownCompilerException
25052501
return (comp, fromMaybe buildPlatform maybePlatform, programDb)
25062502

Diff for: Cabal/src/Distribution/Simple/Errors.hs

+2-6
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ data CabalException
7878
| NoSupportBuildingTestSuite TestType
7979
| NoSupportBuildingBenchMark BenchmarkType
8080
| BuildingNotSupportedWithCompiler
81-
| ProvideHaskellSuiteTool String
82-
| CannotDetermineCompilerVersion
8381
| PkgDumpFailed
8482
| FailedToParseOutput
8583
| CantFindSourceModule ModuleName
@@ -210,8 +208,8 @@ exceptionCode e = case e of
210208
NoSupportBuildingTestSuite{} -> 4106
211209
NoSupportBuildingBenchMark{} -> 5320
212210
BuildingNotSupportedWithCompiler{} -> 7077
213-
ProvideHaskellSuiteTool{} -> 7509
214-
CannotDetermineCompilerVersion{} -> 4519
211+
-- Retired: ProvideHaskellSuiteTool{} -> 7509
212+
-- Retired: CannotDetermineCompilerVersion{} -> 4519
215213
PkgDumpFailed{} -> 2291
216214
FailedToParseOutput{} -> 5500
217215
CantFindSourceModule{} -> 8870
@@ -364,8 +362,6 @@ exceptionMessage e = case e of
364362
NoSupportBuildingTestSuite test_type -> "No support for building test suite type " ++ show test_type
365363
NoSupportBuildingBenchMark benchMarkType -> "No support for building benchmark type " ++ show benchMarkType
366364
BuildingNotSupportedWithCompiler -> "Building is not supported with this compiler."
367-
ProvideHaskellSuiteTool msg -> show msg
368-
CannotDetermineCompilerVersion -> "haskell-suite: couldn't determine compiler version"
369365
PkgDumpFailed -> "pkg dump failed"
370366
FailedToParseOutput -> "failed to parse output of 'pkg dump'"
371367
CantFindSourceModule moduleName -> "can't find source for module " ++ prettyShow moduleName

0 commit comments

Comments
 (0)