From 9dfdd16a61e79cb03c633d442190a81fe5c0b6b8 Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Fri, 20 Mar 2015 12:23:41 +0100 Subject: [PATCH] Bump ghc-prim to 0.4.0.0 This major version bump was made necessary by f44333eae7bc7dc7b6003b75874a02445f6b633b which changed the type signatures of prefetch primops, as well as other changes such as 051d694fc978ad28ac3043d296cafddd3c2a7050 turning `Any` into an abstract closed type family. Reviewed By: ekmett Differential Revision: https://phabricator.haskell.org/D743 --- libraries/base/base.cabal | 2 +- libraries/ghc-prim/ghc-prim.cabal | 4 +- libraries/integer-gmp/integer-gmp.cabal | 2 +- .../indexed-types/should_compile/T3017.stderr | 4 +- .../partial-sigs/should_compile/ADT.stderr | 2 +- .../should_compile/AddAndOr1.stderr | 2 +- .../should_compile/AddAndOr2.stderr | 2 +- .../should_compile/AddAndOr3.stderr | 2 +- .../should_compile/AddAndOr4.stderr | 2 +- .../should_compile/AddAndOr5.stderr | 2 +- .../should_compile/AddAndOr6.stderr | 2 +- .../should_compile/BoolToBool.stderr | 2 +- .../should_compile/Defaulting1MROn.stderr | 2 +- .../should_compile/Defaulting2MROff.stderr | 2 +- .../should_compile/Defaulting2MROn.stderr | 2 +- .../partial-sigs/should_compile/Either.stderr | 2 +- .../partial-sigs/should_compile/Every.stderr | 2 +- .../should_compile/EveryNamed.stderr | 2 +- .../should_compile/ExpressionSig.stderr | 2 +- .../should_compile/ExpressionSigNamed.stderr | 2 +- .../should_compile/ExtraConstraints1.stderr | 2 +- .../should_compile/ExtraConstraints2.stderr | 2 +- .../should_compile/ExtraConstraints3.stderr | 2 +- .../should_compile/ExtraNumAMROff.stderr | 2 +- .../should_compile/Forall1.stderr | 2 +- .../should_compile/GenNamed.stderr | 2 +- .../should_compile/HigherRank1.stderr | 2 +- .../should_compile/HigherRank2.stderr | 2 +- .../should_compile/LocalDefinitionBug.stderr | 2 +- .../should_compile/Meltdown.stderr | 2 +- .../should_compile/MonoLocalBinds.stderr | 4 +- .../should_compile/NamedTyVar.stderr | 2 +- .../should_compile/ParensAroundContext.stderr | 2 +- .../should_compile/PatBind.stderr | 4 +- .../should_compile/PatternSig.stderr | 2 +- .../should_compile/Recursive.stderr | 2 +- .../ScopedNamedWildcards.stderr | 2 +- .../ScopedNamedWildcardsGood.stderr | 2 +- .../should_compile/ShowNamed.stderr | 2 +- .../should_compile/SimpleGen.stderr | 2 +- .../should_compile/SkipMany.stderr | 2 +- .../should_compile/SomethingShowable.stderr | 2 +- .../should_compile/Uncurry.stderr | 2 +- .../should_compile/UncurryNamed.stderr | 2 +- .../WarningWildcardInstantiations.stderr | 2 +- .../tests/roles/should_compile/Roles1.stderr | 4 +- .../tests/roles/should_compile/Roles14.stderr | 4 +- .../tests/roles/should_compile/Roles2.stderr | 4 +- .../tests/roles/should_compile/Roles3.stderr | 4 +- .../tests/roles/should_compile/Roles4.stderr | 4 +- .../tests/roles/should_compile/T8958.stderr | 72 +++++++++---------- .../safeHaskell/check/pkg01/safePkg01.stdout | 16 ++--- .../typecheck/should_compile/tc231.stderr | 38 +++++----- 53 files changed, 122 insertions(+), 122 deletions(-) diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal index 29936929ac..64ab7085a6 100644 --- a/libraries/base/base.cabal +++ b/libraries/base/base.cabal @@ -98,7 +98,7 @@ Library UnliftedFFITypes Unsafe - build-depends: rts == 1.0.*, ghc-prim >= 0.3.1 && < 0.4 + build-depends: rts == 1.0.*, ghc-prim == 0.4.* if flag(integer-simple) build-depends: integer-simple >= 0.1.1 && < 0.2 diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal index c87f3363c3..b9e74d1fa3 100644 --- a/libraries/ghc-prim/ghc-prim.cabal +++ b/libraries/ghc-prim/ghc-prim.cabal @@ -1,6 +1,6 @@ name: ghc-prim -version: 0.3.1.0 --- GHC 7.6.1 released with 0.3.0.0 +version: 0.4.0.0 +-- GHC 7.8.4 released with 0.3.1.0 license: BSD3 license-file: LICENSE category: GHC diff --git a/libraries/integer-gmp/integer-gmp.cabal b/libraries/integer-gmp/integer-gmp.cabal index 376139f102..493da28e80 100644 --- a/libraries/integer-gmp/integer-gmp.cabal +++ b/libraries/integer-gmp/integer-gmp.cabal @@ -73,7 +73,7 @@ Library c-sources: cbits/cbits.c include-dirs: include - build-depends: ghc-prim >= 0.3.1 && < 0.4 + build-depends: ghc-prim == 0.4.* -- We need to set the package key to integer-gmp -- (without a version number) as it's magic. diff --git a/testsuite/tests/indexed-types/should_compile/T3017.stderr b/testsuite/tests/indexed-types/should_compile/T3017.stderr index ec97deaf18..ab480b49b0 100644 --- a/testsuite/tests/indexed-types/should_compile/T3017.stderr +++ b/testsuite/tests/indexed-types/should_compile/T3017.stderr @@ -16,5 +16,5 @@ INSTANCES FAMILY INSTANCES type Elem (ListColl a) Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, - integer-gmp-0.5.1.0] +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, + integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/ADT.stderr b/testsuite/tests/partial-sigs/should_compile/ADT.stderr index 74b1ae18f9..2dccd92545 100644 --- a/testsuite/tests/partial-sigs/should_compile/ADT.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ADT.stderr @@ -5,5 +5,5 @@ TYPE CONSTRUCTORS Promotable COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr1.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr1.stderr index b0952b4d5e..acd08095ed 100644 --- a/testsuite/tests/partial-sigs/should_compile/AddAndOr1.stderr +++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr1.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr2.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr2.stderr index f902a80073..9c55bb1f2f 100644 --- a/testsuite/tests/partial-sigs/should_compile/AddAndOr2.stderr +++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr2.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr3.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr3.stderr index f68e6ef50d..7d7d3bb726 100644 --- a/testsuite/tests/partial-sigs/should_compile/AddAndOr3.stderr +++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr3.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr4.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr4.stderr index be7cc05f1b..7f1dd30eda 100644 --- a/testsuite/tests/partial-sigs/should_compile/AddAndOr4.stderr +++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr4.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr5.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr5.stderr index 8e6699443f..bbbed0d413 100644 --- a/testsuite/tests/partial-sigs/should_compile/AddAndOr5.stderr +++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr5.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/AddAndOr6.stderr b/testsuite/tests/partial-sigs/should_compile/AddAndOr6.stderr index ec1703a535..44f74b9300 100644 --- a/testsuite/tests/partial-sigs/should_compile/AddAndOr6.stderr +++ b/testsuite/tests/partial-sigs/should_compile/AddAndOr6.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/BoolToBool.stderr b/testsuite/tests/partial-sigs/should_compile/BoolToBool.stderr index 3d8f949fd0..e7865eff7e 100644 --- a/testsuite/tests/partial-sigs/should_compile/BoolToBool.stderr +++ b/testsuite/tests/partial-sigs/should_compile/BoolToBool.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/Defaulting1MROn.stderr b/testsuite/tests/partial-sigs/should_compile/Defaulting1MROn.stderr index fbcaddebfc..f81efb1d69 100644 --- a/testsuite/tests/partial-sigs/should_compile/Defaulting1MROn.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Defaulting1MROn.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr b/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr index fb95845970..5418eb5cac 100644 --- a/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Defaulting2MROff.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr b/testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr index 9fda9ec815..65a7bc7ff1 100644 --- a/testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Defaulting2MROn.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/Either.stderr b/testsuite/tests/partial-sigs/should_compile/Either.stderr index bff0e846eb..11aaf4d5db 100644 --- a/testsuite/tests/partial-sigs/should_compile/Either.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Either.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/Every.stderr b/testsuite/tests/partial-sigs/should_compile/Every.stderr index 90bcb57471..caa57db5bf 100644 --- a/testsuite/tests/partial-sigs/should_compile/Every.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Every.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr b/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr index ce7c7a3d81..e04c2de1c0 100644 --- a/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr +++ b/testsuite/tests/partial-sigs/should_compile/EveryNamed.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/ExpressionSig.stderr b/testsuite/tests/partial-sigs/should_compile/ExpressionSig.stderr index 3d8f949fd0..e7865eff7e 100644 --- a/testsuite/tests/partial-sigs/should_compile/ExpressionSig.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ExpressionSig.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/ExpressionSigNamed.stderr b/testsuite/tests/partial-sigs/should_compile/ExpressionSigNamed.stderr index 3d8f949fd0..e7865eff7e 100644 --- a/testsuite/tests/partial-sigs/should_compile/ExpressionSigNamed.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ExpressionSigNamed.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints1.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints1.stderr index 15eb30d1bf..05ccb61572 100644 --- a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints1.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints1.stderr @@ -7,5 +7,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints2.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints2.stderr index 8c28c5b93b..19b4544224 100644 --- a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints2.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints2.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr index f4df3cb141..e43150970f 100644 --- a/testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr @@ -230,5 +230,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROff.stderr b/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROff.stderr index 6bb444ad36..c4d33c12a5 100644 --- a/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROff.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ExtraNumAMROff.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/Forall1.stderr b/testsuite/tests/partial-sigs/should_compile/Forall1.stderr index 1af38e4a62..e6ef981c15 100644 --- a/testsuite/tests/partial-sigs/should_compile/Forall1.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Forall1.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/GenNamed.stderr b/testsuite/tests/partial-sigs/should_compile/GenNamed.stderr index 3d8f949fd0..e7865eff7e 100644 --- a/testsuite/tests/partial-sigs/should_compile/GenNamed.stderr +++ b/testsuite/tests/partial-sigs/should_compile/GenNamed.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/HigherRank1.stderr b/testsuite/tests/partial-sigs/should_compile/HigherRank1.stderr index 1a3e436cac..9785fce54f 100644 --- a/testsuite/tests/partial-sigs/should_compile/HigherRank1.stderr +++ b/testsuite/tests/partial-sigs/should_compile/HigherRank1.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/HigherRank2.stderr b/testsuite/tests/partial-sigs/should_compile/HigherRank2.stderr index 1a3e436cac..9785fce54f 100644 --- a/testsuite/tests/partial-sigs/should_compile/HigherRank2.stderr +++ b/testsuite/tests/partial-sigs/should_compile/HigherRank2.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/LocalDefinitionBug.stderr b/testsuite/tests/partial-sigs/should_compile/LocalDefinitionBug.stderr index 9f99e17bfe..a5de44f181 100644 --- a/testsuite/tests/partial-sigs/should_compile/LocalDefinitionBug.stderr +++ b/testsuite/tests/partial-sigs/should_compile/LocalDefinitionBug.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/Meltdown.stderr b/testsuite/tests/partial-sigs/should_compile/Meltdown.stderr index 303f72a3ec..e0c4c11c83 100644 --- a/testsuite/tests/partial-sigs/should_compile/Meltdown.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Meltdown.stderr @@ -14,5 +14,5 @@ INSTANCES -- Defined at Meltdown.hs:11:10 instance Monad (NukeMonad a b) -- Defined at Meltdown.hs:15:10 Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/MonoLocalBinds.stderr b/testsuite/tests/partial-sigs/should_compile/MonoLocalBinds.stderr index 5da503bfd9..a5de44f181 100644 --- a/testsuite/tests/partial-sigs/should_compile/MonoLocalBinds.stderr +++ b/testsuite/tests/partial-sigs/should_compile/MonoLocalBinds.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, - integer-gmp-0.5.1.0] +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, + integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/NamedTyVar.stderr b/testsuite/tests/partial-sigs/should_compile/NamedTyVar.stderr index e6c007a602..e62132f762 100644 --- a/testsuite/tests/partial-sigs/should_compile/NamedTyVar.stderr +++ b/testsuite/tests/partial-sigs/should_compile/NamedTyVar.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/ParensAroundContext.stderr b/testsuite/tests/partial-sigs/should_compile/ParensAroundContext.stderr index 53fb335e8c..ba1fb55b7c 100644 --- a/testsuite/tests/partial-sigs/should_compile/ParensAroundContext.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ParensAroundContext.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/PatBind.stderr b/testsuite/tests/partial-sigs/should_compile/PatBind.stderr index 492cde1197..62bf9eecc9 100644 --- a/testsuite/tests/partial-sigs/should_compile/PatBind.stderr +++ b/testsuite/tests/partial-sigs/should_compile/PatBind.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, - integer-gmp-0.5.1.0] +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, + integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/PatternSig.stderr b/testsuite/tests/partial-sigs/should_compile/PatternSig.stderr index 3d8f949fd0..e7865eff7e 100644 --- a/testsuite/tests/partial-sigs/should_compile/PatternSig.stderr +++ b/testsuite/tests/partial-sigs/should_compile/PatternSig.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/Recursive.stderr b/testsuite/tests/partial-sigs/should_compile/Recursive.stderr index 71258f48ff..626b4d28f8 100644 --- a/testsuite/tests/partial-sigs/should_compile/Recursive.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Recursive.stderr @@ -5,5 +5,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcards.stderr b/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcards.stderr index 9757f043c8..5434044886 100644 --- a/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcards.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcards.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcardsGood.stderr b/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcardsGood.stderr index 7b9d39fe7d..6dac5ea6c9 100644 --- a/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcardsGood.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ScopedNamedWildcardsGood.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr b/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr index 51e56f1b20..8460586ae6 100644 --- a/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr +++ b/testsuite/tests/partial-sigs/should_compile/ShowNamed.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr b/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr index 96df17eb77..f0ba022d42 100644 --- a/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr +++ b/testsuite/tests/partial-sigs/should_compile/SimpleGen.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/SkipMany.stderr b/testsuite/tests/partial-sigs/should_compile/SkipMany.stderr index 0ebd18b172..d12a3ff418 100644 --- a/testsuite/tests/partial-sigs/should_compile/SkipMany.stderr +++ b/testsuite/tests/partial-sigs/should_compile/SkipMany.stderr @@ -8,5 +8,5 @@ TYPE CONSTRUCTORS Promotable COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr b/testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr index f33d433431..cc8eae05c9 100644 --- a/testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr +++ b/testsuite/tests/partial-sigs/should_compile/SomethingShowable.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr b/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr index 96b90d37ef..6ff0de02eb 100644 --- a/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr b/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr index 1468252f58..a5c2a350e7 100644 --- a/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr +++ b/testsuite/tests/partial-sigs/should_compile/UncurryNamed.stderr @@ -3,5 +3,5 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] diff --git a/testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr b/testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr index 8e0fa1742e..da9aa79b14 100644 --- a/testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr +++ b/testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr @@ -4,7 +4,7 @@ TYPE SIGNATURES TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0] WarningWildcardInstantiations.hs:5:14: Warning: diff --git a/testsuite/tests/roles/should_compile/Roles1.stderr b/testsuite/tests/roles/should_compile/Roles1.stderr index 0ae3048990..01c4691519 100644 --- a/testsuite/tests/roles/should_compile/Roles1.stderr +++ b/testsuite/tests/roles/should_compile/Roles1.stderr @@ -17,8 +17,8 @@ TYPE CONSTRUCTORS data T7 (a :: k) b = K7 b COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, - integer-gmp-0.5.1.0] +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, + integer-gmp-1.0.0.0] ==================== Typechecker ==================== diff --git a/testsuite/tests/roles/should_compile/Roles14.stderr b/testsuite/tests/roles/should_compile/Roles14.stderr index c7e8ed788c..504053bc89 100644 --- a/testsuite/tests/roles/should_compile/Roles14.stderr +++ b/testsuite/tests/roles/should_compile/Roles14.stderr @@ -6,8 +6,8 @@ TYPE CONSTRUCTORS COERCION AXIOMS axiom Roles12.NTCo:C2 :: C2 a = a -> a Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, - integer-gmp-0.5.1.0] +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, + integer-gmp-1.0.0.0] ==================== Typechecker ==================== diff --git a/testsuite/tests/roles/should_compile/Roles2.stderr b/testsuite/tests/roles/should_compile/Roles2.stderr index b6f13b4e1f..afd2d8cf96 100644 --- a/testsuite/tests/roles/should_compile/Roles2.stderr +++ b/testsuite/tests/roles/should_compile/Roles2.stderr @@ -5,8 +5,8 @@ TYPE CONSTRUCTORS data T2 a = K2 (FunPtr a) COERCION AXIOMS Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, - integer-gmp-0.5.1.0] +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, + integer-gmp-1.0.0.0] ==================== Typechecker ==================== diff --git a/testsuite/tests/roles/should_compile/Roles3.stderr b/testsuite/tests/roles/should_compile/Roles3.stderr index 5814d4d50a..506b895dda 100644 --- a/testsuite/tests/roles/should_compile/Roles3.stderr +++ b/testsuite/tests/roles/should_compile/Roles3.stderr @@ -18,8 +18,8 @@ COERCION AXIOMS axiom Roles3.NTCo:C3 :: C3 a b = a -> F3 b -> F3 b axiom Roles3.NTCo:C4 :: C4 a b = a -> F4 b -> F4 b Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, - integer-gmp-0.5.1.0] +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, + integer-gmp-1.0.0.0] ==================== Typechecker ==================== diff --git a/testsuite/tests/roles/should_compile/Roles4.stderr b/testsuite/tests/roles/should_compile/Roles4.stderr index 7ca6478dc7..26f9abda0c 100644 --- a/testsuite/tests/roles/should_compile/Roles4.stderr +++ b/testsuite/tests/roles/should_compile/Roles4.stderr @@ -9,8 +9,8 @@ COERCION AXIOMS axiom Roles4.NTCo:C1 :: C1 a = a -> a axiom Roles4.NTCo:C3 :: C3 a = a -> Syn1 a Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, - integer-gmp-0.5.1.0] +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, + integer-gmp-1.0.0.0] ==================== Typechecker ==================== diff --git a/testsuite/tests/roles/should_compile/T8958.stderr b/testsuite/tests/roles/should_compile/T8958.stderr index 558b360604..abcd5581c9 100644 --- a/testsuite/tests/roles/should_compile/T8958.stderr +++ b/testsuite/tests/roles/should_compile/T8958.stderr @@ -1,36 +1,36 @@ - -T8958.hs:1:31: Warning: - -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language. -TYPE SIGNATURES -TYPE CONSTRUCTORS - type role Map nominal representational - newtype (Nominal k, Representational v) => Map k v = MkMap [(k, v)] - Promotable - class Nominal a - type role Representational representational - class Representational a -COERCION AXIOMS - axiom T8958.NTCo:Map :: Map k v = [(k, v)] -INSTANCES - instance [incoherent] Nominal a -- Defined at T8958.hs:7:10 - instance [incoherent] Representational a - -- Defined at T8958.hs:10:10 -Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, - integer-gmp-0.5.1.0] - -==================== Typechecker ==================== -AbsBinds [a] [] - {Exports: [T8958.$fRepresentationala <= $dRepresentational - <>] - Exported types: T8958.$fRepresentationala - :: forall a. Representational a - [LclIdX[DFunId], Str=DmdType] - Binds: $dRepresentational = T8958.D:Representational} -AbsBinds [a] [] - {Exports: [T8958.$fNominala <= $dNominal - <>] - Exported types: T8958.$fNominala :: forall a. Nominal a - [LclIdX[DFunId], Str=DmdType] - Binds: $dNominal = T8958.D:Nominal} - + +T8958.hs:1:31: Warning: + -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language. +TYPE SIGNATURES +TYPE CONSTRUCTORS + type role Map nominal representational + newtype (Nominal k, Representational v) => Map k v = MkMap [(k, v)] + Promotable + class Nominal a + type role Representational representational + class Representational a +COERCION AXIOMS + axiom T8958.NTCo:Map :: Map k v = [(k, v)] +INSTANCES + instance [incoherent] Nominal a -- Defined at T8958.hs:7:10 + instance [incoherent] Representational a + -- Defined at T8958.hs:10:10 +Dependent modules: [] +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, + integer-gmp-1.0.0.0] + +==================== Typechecker ==================== +AbsBinds [a] [] + {Exports: [T8958.$fRepresentationala <= $dRepresentational + <>] + Exported types: T8958.$fRepresentationala + :: forall a. Representational a + [LclIdX[DFunId], Str=DmdType] + Binds: $dRepresentational = T8958.D:Representational} +AbsBinds [a] [] + {Exports: [T8958.$fNominala <= $dNominal + <>] + Exported types: T8958.$fNominala :: forall a. Nominal a + [LclIdX[DFunId], Str=DmdType] + Binds: $dNominal = T8958.D:Nominal} + diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout index 700f3a3b3f..51b047fca8 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout +++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout @@ -4,42 +4,42 @@ pdb.safePkg01/local.db: trusted: False M_SafePkg -package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0 integer-gmp-1.0.0.0 +package dependencies: base-4.8.0.0* ghc-prim-0.4.0.0 integer-gmp-1.0.0.0 trusted: safe require own pkg trusted: False M_SafePkg2 -package dependencies: base-4.8.0.0 ghc-prim-0.3.1.0 integer-gmp-1.0.0.0 +package dependencies: base-4.8.0.0 ghc-prim-0.4.0.0 integer-gmp-1.0.0.0 trusted: trustworthy require own pkg trusted: False M_SafePkg3 -package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0 integer-gmp-1.0.0.0 +package dependencies: base-4.8.0.0* ghc-prim-0.4.0.0 integer-gmp-1.0.0.0 trusted: safe require own pkg trusted: True M_SafePkg4 -package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0 integer-gmp-1.0.0.0 +package dependencies: base-4.8.0.0* ghc-prim-0.4.0.0 integer-gmp-1.0.0.0 trusted: safe require own pkg trusted: True M_SafePkg5 -package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0 integer-gmp-1.0.0.0 +package dependencies: base-4.8.0.0* ghc-prim-0.4.0.0 integer-gmp-1.0.0.0 trusted: safe require own pkg trusted: True M_SafePkg6 -package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.3.1.0 integer-gmp-1.0.0.0 +package dependencies: array-0.5.1.0 base-4.8.0.0* bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.4.0.0 integer-gmp-1.0.0.0 trusted: trustworthy require own pkg trusted: False M_SafePkg7 -package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.3.1.0 integer-gmp-1.0.0.0 +package dependencies: array-0.5.1.0 base-4.8.0.0* bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.4.0.0 integer-gmp-1.0.0.0 trusted: safe require own pkg trusted: False M_SafePkg8 -package dependencies: array-0.5.0.1 base-4.8.0.0 bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.3.1.0 integer-gmp-1.0.0.0 +package dependencies: array-0.5.1.0 base-4.8.0.0 bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.4.0.0 integer-gmp-1.0.0.0 trusted: trustworthy require own pkg trusted: False diff --git a/testsuite/tests/typecheck/should_compile/tc231.stderr b/testsuite/tests/typecheck/should_compile/tc231.stderr index 098fe94a0c..3f10f55027 100644 --- a/testsuite/tests/typecheck/should_compile/tc231.stderr +++ b/testsuite/tests/typecheck/should_compile/tc231.stderr @@ -1,19 +1,19 @@ -TYPE SIGNATURES - foo :: - forall s b chain. - Zork s (Z [Char]) b => - Q s (Z [Char]) chain -> ST s () - s :: forall t t1. Q t (Z [Char]) t1 -> Q t (Z [Char]) t1 -TYPE CONSTRUCTORS - data Q s a chain = Node s a chain - Promotable - data Z a = Z a - Promotable - class Zork s a b | a -> b where - huh :: Q s a chain -> ST s () -COERCION AXIOMS - axiom NTCo:Zork :: - Zork s a b = forall chain. Q s a chain -> ST s () -Dependent modules: [] -Dependent packages: [base-4.8.0.0, ghc-prim-0.3.1.0, - integer-gmp-0.5.1.0] +TYPE SIGNATURES + foo :: + forall s b chain. + Zork s (Z [Char]) b => + Q s (Z [Char]) chain -> ST s () + s :: forall t t1. Q t (Z [Char]) t1 -> Q t (Z [Char]) t1 +TYPE CONSTRUCTORS + data Q s a chain = Node s a chain + Promotable + data Z a = Z a + Promotable + class Zork s a b | a -> b where + huh :: Q s a chain -> ST s () +COERCION AXIOMS + axiom NTCo:Zork :: + Zork s a b = forall chain. Q s a chain -> ST s () +Dependent modules: [] +Dependent packages: [base-4.8.0.0, ghc-prim-0.4.0.0, + integer-gmp-1.0.0.0] -- GitLab