From d1d698a4c0ffce0fe617c619aef79f683a6f3c75 Mon Sep 17 00:00:00 2001 From: Javier Sagredo Date: Fri, 5 Jul 2024 15:27:29 +0200 Subject: [PATCH] Fix tests --- .../Distribution/PackageDescription/Configuration.hs | 10 +++++----- Cabal-syntax/src/Distribution/Types/DefaultBounds.hs | 6 +++--- .../tests/ParserTests/regressions/Octree-0.5.expr | 4 +++- Cabal-tests/tests/ParserTests/regressions/anynone.expr | 4 +++- .../tests/ParserTests/regressions/big-version.expr | 4 +++- .../ParserTests/regressions/common-conditional.expr | 4 +++- Cabal-tests/tests/ParserTests/regressions/common.expr | 4 +++- Cabal-tests/tests/ParserTests/regressions/common2.expr | 4 +++- Cabal-tests/tests/ParserTests/regressions/common3.expr | 4 +++- Cabal-tests/tests/ParserTests/regressions/elif.expr | 4 +++- Cabal-tests/tests/ParserTests/regressions/elif2.expr | 4 +++- .../tests/ParserTests/regressions/encoding-0.8.expr | 4 +++- .../tests/ParserTests/regressions/generics-sop.expr | 4 +++- .../tests/ParserTests/regressions/hasktorch.expr | 4 +++- .../tests/ParserTests/regressions/hidden-main-lib.expr | 4 +++- .../tests/ParserTests/regressions/indentation.expr | 4 +++- .../tests/ParserTests/regressions/indentation2.expr | 4 +++- .../tests/ParserTests/regressions/indentation3.expr | 4 +++- .../tests/ParserTests/regressions/issue-5055.expr | 4 +++- .../tests/ParserTests/regressions/issue-5846.expr | 4 +++- .../tests/ParserTests/regressions/issue-6083-a.expr | 4 +++- .../tests/ParserTests/regressions/issue-6083-b.expr | 4 +++- .../tests/ParserTests/regressions/issue-6083-c.expr | 4 +++- .../ParserTests/regressions/issue-6083-pkg-pkg.expr | 4 +++- .../tests/ParserTests/regressions/issue-774.expr | 4 +++- .../ParserTests/regressions/jaeger-flamegraph.expr | 4 +++- .../tests/ParserTests/regressions/leading-comma-2.expr | 4 +++- .../tests/ParserTests/regressions/leading-comma.expr | 4 +++- Cabal-tests/tests/ParserTests/regressions/libpq1.expr | 4 +++- Cabal-tests/tests/ParserTests/regressions/libpq2.expr | 4 +++- Cabal-tests/tests/ParserTests/regressions/mixin-1.expr | 4 +++- Cabal-tests/tests/ParserTests/regressions/mixin-2.expr | 4 +++- Cabal-tests/tests/ParserTests/regressions/mixin-3.expr | 4 +++- .../tests/ParserTests/regressions/monad-param.expr | 4 +++- .../tests/ParserTests/regressions/multiple-libs-2.expr | 4 +++- .../tests/ParserTests/regressions/noVersion.expr | 4 +++- .../tests/ParserTests/regressions/nothing-unicode.expr | 4 +++- Cabal-tests/tests/ParserTests/regressions/shake.expr | 4 +++- Cabal-tests/tests/ParserTests/regressions/spdx-1.expr | 4 +++- Cabal-tests/tests/ParserTests/regressions/spdx-2.expr | 4 +++- Cabal-tests/tests/ParserTests/regressions/spdx-3.expr | 4 +++- .../ParserTests/regressions/th-lift-instances.expr | 4 +++- .../tests/ParserTests/regressions/version-sets.expr | 4 +++- .../tests/ParserTests/regressions/wl-pprint-indef.expr | 4 +++- .../tests/UnitTests/Distribution/Utils/Structured.hs | 4 ++-- 45 files changed, 136 insertions(+), 52 deletions(-) diff --git a/Cabal-syntax/src/Distribution/PackageDescription/Configuration.hs b/Cabal-syntax/src/Distribution/PackageDescription/Configuration.hs index 988039ee187..6c10796b4a7 100644 --- a/Cabal-syntax/src/Distribution/PackageDescription/Configuration.hs +++ b/Cabal-syntax/src/Distribution/PackageDescription/Configuration.hs @@ -520,11 +520,11 @@ finalizePD -- Combine lib, exes, and tests into one list of @CondTree@s with tagged data condTrees = maybeToList (fmap (mapTreeData Lib . appBounds) mb_lib0) - ++ map (\(name, tree) -> mapTreeData (SubComp name . CLib) $ appBounds tree) sub_libs0 - ++ map (\(name, tree) -> mapTreeData (SubComp name . CFLib) $ appBounds tree) flibs0 - ++ map (\(name, tree) -> mapTreeData (SubComp name . CExe) $ appBounds tree) exes0 - ++ map (\(name, tree) -> mapTreeData (SubComp name . CTest) $ appBounds tree) tests0 - ++ map (\(name, tree) -> mapTreeData (SubComp name . CBench) $ appBounds tree) bms0 + ++ map (\(name, tree) -> mapTreeData (SubComp name . CLib) $ appBounds tree) sub_libs0 + ++ map (\(name, tree) -> mapTreeData (SubComp name . CFLib) $ appBounds tree) flibs0 + ++ map (\(name, tree) -> mapTreeData (SubComp name . CExe) $ appBounds tree) exes0 + ++ map (\(name, tree) -> mapTreeData (SubComp name . CTest) $ appBounds tree) tests0 + ++ map (\(name, tree) -> mapTreeData (SubComp name . CBench) $ appBounds tree) bms0 flagChoices = map (\(MkPackageFlag n _ d manual) -> (n, d2c manual n d)) flags d2c manual n b = case lookupFlagAssignment n userflags of diff --git a/Cabal-syntax/src/Distribution/Types/DefaultBounds.hs b/Cabal-syntax/src/Distribution/Types/DefaultBounds.hs index b21da2e87a7..e25081d3b79 100644 --- a/Cabal-syntax/src/Distribution/Types/DefaultBounds.hs +++ b/Cabal-syntax/src/Distribution/Types/DefaultBounds.hs @@ -35,14 +35,14 @@ applyDefaultBoundsToCondTree -> CondTree cv [Dependency] a -> CondTree cv [Dependency] a applyDefaultBoundsToCondTree db = - mapTreeData (applyDefaultBoundsToBuildInfo db) - . mapTreeConstrs (applyDefaultBoundsToDependencies db) + mapTreeData (applyDefaultBoundsToBuildInfo db) + . mapTreeConstrs (applyDefaultBoundsToDependencies db) applyDefaultBoundsToBuildInfo :: L.HasBuildInfo a => DefaultBounds -> a -> a applyDefaultBoundsToBuildInfo db bi = bi & L.targetBuildDepends %~ applyDefaultBoundsToDependencies db - & L.buildToolDepends %~ applyDefaultBoundsToExeDependencies db + & L.buildToolDepends %~ applyDefaultBoundsToExeDependencies db applyDefaultBoundsToDependencies :: DefaultBounds -> [Dependency] -> [Dependency] applyDefaultBoundsToDependencies (DefaultBounds [] _) = id diff --git a/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr b/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr index 77a263aaad3..b4a49ccc2d7 100644 --- a/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr +++ b/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr @@ -70,7 +70,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/anynone.expr b/Cabal-tests/tests/ParserTests/regressions/anynone.expr index 555b5fd6c66..f1067157c45 100644 --- a/Cabal-tests/tests/ParserTests/regressions/anynone.expr +++ b/Cabal-tests/tests/ParserTests/regressions/anynone.expr @@ -36,7 +36,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/big-version.expr b/Cabal-tests/tests/ParserTests/regressions/big-version.expr index d7aa02f7f07..cbd5943833e 100644 --- a/Cabal-tests/tests/ParserTests/regressions/big-version.expr +++ b/Cabal-tests/tests/ParserTests/regressions/big-version.expr @@ -38,7 +38,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/common-conditional.expr b/Cabal-tests/tests/ParserTests/regressions/common-conditional.expr index 45daaff5348..436e22a0f2d 100644 --- a/Cabal-tests/tests/ParserTests/regressions/common-conditional.expr +++ b/Cabal-tests/tests/ParserTests/regressions/common-conditional.expr @@ -53,7 +53,9 @@ GenericPackageDescription { flagDefault = True, flagManual = True}], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/common.expr b/Cabal-tests/tests/ParserTests/regressions/common.expr index 9fcc46d63b1..e65978caced 100644 --- a/Cabal-tests/tests/ParserTests/regressions/common.expr +++ b/Cabal-tests/tests/ParserTests/regressions/common.expr @@ -51,7 +51,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/common2.expr b/Cabal-tests/tests/ParserTests/regressions/common2.expr index 8607bde5f3a..d6f2d6d135a 100644 --- a/Cabal-tests/tests/ParserTests/regressions/common2.expr +++ b/Cabal-tests/tests/ParserTests/regressions/common2.expr @@ -47,7 +47,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/common3.expr b/Cabal-tests/tests/ParserTests/regressions/common3.expr index f79fc0b4a0f..3d53b2b0f0b 100644 --- a/Cabal-tests/tests/ParserTests/regressions/common3.expr +++ b/Cabal-tests/tests/ParserTests/regressions/common3.expr @@ -51,7 +51,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/elif.expr b/Cabal-tests/tests/ParserTests/regressions/elif.expr index 60071a7c48b..9f7e8482ece 100644 --- a/Cabal-tests/tests/ParserTests/regressions/elif.expr +++ b/Cabal-tests/tests/ParserTests/regressions/elif.expr @@ -46,7 +46,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/elif2.expr b/Cabal-tests/tests/ParserTests/regressions/elif2.expr index c7b68fb69b7..4668688e663 100644 --- a/Cabal-tests/tests/ParserTests/regressions/elif2.expr +++ b/Cabal-tests/tests/ParserTests/regressions/elif2.expr @@ -46,7 +46,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/encoding-0.8.expr b/Cabal-tests/tests/ParserTests/regressions/encoding-0.8.expr index 9222eaff9aa..59d63060ef4 100644 --- a/Cabal-tests/tests/ParserTests/regressions/encoding-0.8.expr +++ b/Cabal-tests/tests/ParserTests/regressions/encoding-0.8.expr @@ -51,7 +51,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/generics-sop.expr b/Cabal-tests/tests/ParserTests/regressions/generics-sop.expr index ac2c0ea4d6e..55277874d94 100644 --- a/Cabal-tests/tests/ParserTests/regressions/generics-sop.expr +++ b/Cabal-tests/tests/ParserTests/regressions/generics-sop.expr @@ -127,7 +127,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/hasktorch.expr b/Cabal-tests/tests/ParserTests/regressions/hasktorch.expr index 2a70a60f71e..cf7fe6eedfc 100644 --- a/Cabal-tests/tests/ParserTests/regressions/hasktorch.expr +++ b/Cabal-tests/tests/ParserTests/regressions/hasktorch.expr @@ -70,7 +70,9 @@ GenericPackageDescription { flagDefault = False, flagManual = False}], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/hidden-main-lib.expr b/Cabal-tests/tests/ParserTests/regressions/hidden-main-lib.expr index 8d400ac671f..ecb716c2ee9 100644 --- a/Cabal-tests/tests/ParserTests/regressions/hidden-main-lib.expr +++ b/Cabal-tests/tests/ParserTests/regressions/hidden-main-lib.expr @@ -38,7 +38,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/indentation.expr b/Cabal-tests/tests/ParserTests/regressions/indentation.expr index cc303c75b75..d742213c3c6 100644 --- a/Cabal-tests/tests/ParserTests/regressions/indentation.expr +++ b/Cabal-tests/tests/ParserTests/regressions/indentation.expr @@ -48,7 +48,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/indentation2.expr b/Cabal-tests/tests/ParserTests/regressions/indentation2.expr index d0c46a34eab..3f3dde4a3e9 100644 --- a/Cabal-tests/tests/ParserTests/regressions/indentation2.expr +++ b/Cabal-tests/tests/ParserTests/regressions/indentation2.expr @@ -41,7 +41,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/indentation3.expr b/Cabal-tests/tests/ParserTests/regressions/indentation3.expr index 0ba1404c095..675f94b22ca 100644 --- a/Cabal-tests/tests/ParserTests/regressions/indentation3.expr +++ b/Cabal-tests/tests/ParserTests/regressions/indentation3.expr @@ -43,7 +43,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-5055.expr b/Cabal-tests/tests/ParserTests/regressions/issue-5055.expr index f84e6506f38..2fca3955892 100644 --- a/Cabal-tests/tests/ParserTests/regressions/issue-5055.expr +++ b/Cabal-tests/tests/ParserTests/regressions/issue-5055.expr @@ -38,7 +38,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Nothing, condSubLibraries = [], condForeignLibs = [], diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-5846.expr b/Cabal-tests/tests/ParserTests/regressions/issue-5846.expr index 58da04c977b..652d4688641 100644 --- a/Cabal-tests/tests/ParserTests/regressions/issue-5846.expr +++ b/Cabal-tests/tests/ParserTests/regressions/issue-5846.expr @@ -36,7 +36,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-6083-a.expr b/Cabal-tests/tests/ParserTests/regressions/issue-6083-a.expr index d3d213d58ab..c4ba4522650 100644 --- a/Cabal-tests/tests/ParserTests/regressions/issue-6083-a.expr +++ b/Cabal-tests/tests/ParserTests/regressions/issue-6083-a.expr @@ -36,7 +36,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-6083-b.expr b/Cabal-tests/tests/ParserTests/regressions/issue-6083-b.expr index c8cca40546e..c3d6b143bc5 100644 --- a/Cabal-tests/tests/ParserTests/regressions/issue-6083-b.expr +++ b/Cabal-tests/tests/ParserTests/regressions/issue-6083-b.expr @@ -36,7 +36,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-6083-c.expr b/Cabal-tests/tests/ParserTests/regressions/issue-6083-c.expr index 08d463693a5..2f4c59e9e5b 100644 --- a/Cabal-tests/tests/ParserTests/regressions/issue-6083-c.expr +++ b/Cabal-tests/tests/ParserTests/regressions/issue-6083-c.expr @@ -36,7 +36,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.expr b/Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.expr index 39f2efc4598..857b8166ece 100644 --- a/Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.expr +++ b/Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.expr @@ -36,7 +36,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-774.expr b/Cabal-tests/tests/ParserTests/regressions/issue-774.expr index 1c392d38e8a..dff32630a91 100644 --- a/Cabal-tests/tests/ParserTests/regressions/issue-774.expr +++ b/Cabal-tests/tests/ParserTests/regressions/issue-774.expr @@ -45,7 +45,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.expr b/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.expr index 84a24f82a7c..a0c3d508b71 100644 --- a/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.expr +++ b/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.expr @@ -77,7 +77,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/leading-comma-2.expr b/Cabal-tests/tests/ParserTests/regressions/leading-comma-2.expr index ffe1cfccd7a..c6389e7b6f6 100644 --- a/Cabal-tests/tests/ParserTests/regressions/leading-comma-2.expr +++ b/Cabal-tests/tests/ParserTests/regressions/leading-comma-2.expr @@ -38,7 +38,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/leading-comma.expr b/Cabal-tests/tests/ParserTests/regressions/leading-comma.expr index 1f67c72f846..f02f80e4f7e 100644 --- a/Cabal-tests/tests/ParserTests/regressions/leading-comma.expr +++ b/Cabal-tests/tests/ParserTests/regressions/leading-comma.expr @@ -38,7 +38,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/libpq1.expr b/Cabal-tests/tests/ParserTests/regressions/libpq1.expr index 47287fbc8eb..d6d35d761f3 100644 --- a/Cabal-tests/tests/ParserTests/regressions/libpq1.expr +++ b/Cabal-tests/tests/ParserTests/regressions/libpq1.expr @@ -121,7 +121,9 @@ GenericPackageDescription { flagDefault = False, flagManual = True}], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/libpq2.expr b/Cabal-tests/tests/ParserTests/regressions/libpq2.expr index 636a25c7741..c197379499b 100644 --- a/Cabal-tests/tests/ParserTests/regressions/libpq2.expr +++ b/Cabal-tests/tests/ParserTests/regressions/libpq2.expr @@ -125,7 +125,9 @@ GenericPackageDescription { flagDefault = False, flagManual = True}], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/mixin-1.expr b/Cabal-tests/tests/ParserTests/regressions/mixin-1.expr index 4d37fd39187..b9da1e71899 100644 --- a/Cabal-tests/tests/ParserTests/regressions/mixin-1.expr +++ b/Cabal-tests/tests/ParserTests/regressions/mixin-1.expr @@ -36,7 +36,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Nothing, condSubLibraries = [], condForeignLibs = [], diff --git a/Cabal-tests/tests/ParserTests/regressions/mixin-2.expr b/Cabal-tests/tests/ParserTests/regressions/mixin-2.expr index 0da2ce70a39..d8bc0720674 100644 --- a/Cabal-tests/tests/ParserTests/regressions/mixin-2.expr +++ b/Cabal-tests/tests/ParserTests/regressions/mixin-2.expr @@ -36,7 +36,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Nothing, condSubLibraries = [], condForeignLibs = [], diff --git a/Cabal-tests/tests/ParserTests/regressions/mixin-3.expr b/Cabal-tests/tests/ParserTests/regressions/mixin-3.expr index 03965350e71..f7587968bcb 100644 --- a/Cabal-tests/tests/ParserTests/regressions/mixin-3.expr +++ b/Cabal-tests/tests/ParserTests/regressions/mixin-3.expr @@ -36,7 +36,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Nothing, condSubLibraries = [], condForeignLibs = [], diff --git a/Cabal-tests/tests/ParserTests/regressions/monad-param.expr b/Cabal-tests/tests/ParserTests/regressions/monad-param.expr index 17e2c63e6c0..f52da60c53a 100644 --- a/Cabal-tests/tests/ParserTests/regressions/monad-param.expr +++ b/Cabal-tests/tests/ParserTests/regressions/monad-param.expr @@ -46,7 +46,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.expr b/Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.expr index 284e62e180c..bca8eaa8a7b 100644 --- a/Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.expr +++ b/Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.expr @@ -38,7 +38,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/noVersion.expr b/Cabal-tests/tests/ParserTests/regressions/noVersion.expr index f55c7d357bb..bf2cf7f7a7c 100644 --- a/Cabal-tests/tests/ParserTests/regressions/noVersion.expr +++ b/Cabal-tests/tests/ParserTests/regressions/noVersion.expr @@ -38,7 +38,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/nothing-unicode.expr b/Cabal-tests/tests/ParserTests/regressions/nothing-unicode.expr index 0bc096e13f3..edecfc7f43b 100644 --- a/Cabal-tests/tests/ParserTests/regressions/nothing-unicode.expr +++ b/Cabal-tests/tests/ParserTests/regressions/nothing-unicode.expr @@ -53,7 +53,9 @@ GenericPackageDescription { flagDefault = True, flagManual = False}], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/shake.expr b/Cabal-tests/tests/ParserTests/regressions/shake.expr index 44f7e65c866..7bfd4b9139f 100644 --- a/Cabal-tests/tests/ParserTests/regressions/shake.expr +++ b/Cabal-tests/tests/ParserTests/regressions/shake.expr @@ -159,7 +159,9 @@ GenericPackageDescription { flagDefault = False, flagManual = True}], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/spdx-1.expr b/Cabal-tests/tests/ParserTests/regressions/spdx-1.expr index 333848da482..04b3807e7b7 100644 --- a/Cabal-tests/tests/ParserTests/regressions/spdx-1.expr +++ b/Cabal-tests/tests/ParserTests/regressions/spdx-1.expr @@ -37,7 +37,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/spdx-2.expr b/Cabal-tests/tests/ParserTests/regressions/spdx-2.expr index 5d418bb5508..96b906c5b8a 100644 --- a/Cabal-tests/tests/ParserTests/regressions/spdx-2.expr +++ b/Cabal-tests/tests/ParserTests/regressions/spdx-2.expr @@ -41,7 +41,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/spdx-3.expr b/Cabal-tests/tests/ParserTests/regressions/spdx-3.expr index 0986d96f7c4..91373c8d049 100644 --- a/Cabal-tests/tests/ParserTests/regressions/spdx-3.expr +++ b/Cabal-tests/tests/ParserTests/regressions/spdx-3.expr @@ -41,7 +41,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.expr b/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.expr index b963a3a8346..3a4efbe7c82 100644 --- a/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.expr +++ b/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.expr @@ -65,7 +65,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/version-sets.expr b/Cabal-tests/tests/ParserTests/regressions/version-sets.expr index 4191afac338..e7f924f2fed 100644 --- a/Cabal-tests/tests/ParserTests/regressions/version-sets.expr +++ b/Cabal-tests/tests/ParserTests/regressions/version-sets.expr @@ -63,7 +63,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.expr b/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.expr index 27188d028fb..247d6898316 100644 --- a/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.expr +++ b/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.expr @@ -55,7 +55,9 @@ GenericPackageDescription { gpdScannedVersion = Nothing, genPackageFlags = [], genDefaultPackageBounds = - Nothing, + DefaultBounds { + defaultTargetBuildDepends = [], + defaultBuildToolDepends = []}, condLibrary = Just CondNode { condTreeData = Library { diff --git a/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs b/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs index 70370de76c0..bbc85e7606e 100644 --- a/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs +++ b/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs @@ -33,9 +33,9 @@ md5Check proxy md5Int = structureHash proxy @?= md5FromInteger md5Int md5CheckGenericPackageDescription :: Proxy GenericPackageDescription -> Assertion md5CheckGenericPackageDescription proxy = md5Check proxy #if MIN_VERSION_base(4,19,0) - 0xbcb29fedd00cda89586faf963028e31d + 0x84a6403bd4a83748acebe9d676b8e1cb #else - 0xbb48247a1d86d5b514ffc4d6df853c74 + 0xb853c69731d382446f1ae86485f953ac #endif md5CheckLocalBuildInfo :: Proxy LocalBuildInfo -> Assertion