diff --git a/configure.ac b/configure.ac index 91abec04235e198fc0140f9a2cecfecd479fea08..bffd3dbc9d99624383b841cca99867a3611aed31 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ dnl # see what flags are available. (Better yet, read the documentation!) # -AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.4.5], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION]) +AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.4.6], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION]) # Version on master must be X.Y (not X.Y.Z) for ProjectVersionMunged variable # to be useful (cf #19058). However, the version must have three components # (X.Y.Z) on stable branches (e.g. ghc-9.2) to ensure that pre-releases are diff --git a/docs/users_guide/9.4.6-notes.rst b/docs/users_guide/9.4.6-notes.rst new file mode 100644 index 0000000000000000000000000000000000000000..7133eb1f6fa862dc5159691572c41d8cfa763e2c --- /dev/null +++ b/docs/users_guide/9.4.6-notes.rst @@ -0,0 +1,157 @@ +.. _release-9-4-6: + +Version 9.4.6 +============== + +The significant changes to the various parts of the compiler are listed in the +following sections. + +The :ghc-flag:`LLVM backend <-fllvm>` of this release is to be used with LLVM +10, 11, 12, 13, or 14. + +Significant Changes +~~~~~~~~~~~~~~~~~~~~ + +Issues fixed in this release include: + +Compiler +-------- + +- Fix a bug where certain dictionaries for undecidable instances could end up + looping at runtime (:ghc-ticket:`22549`). + +- Fix a compiler panic involving newtype family instances (:ghc-ticket:`23329). + +- Fix a bug preventing using the command line to compile ``.cmm`` files to + assembly (:ghc-ticket:`23610`). + +- Fix compiler panics with certain RULE pragmas (:ghc-ticket:`23208`, + :ghc-ticket:`22761`). + +- Fix a loop in the simplifier due to a bug in the representation of certain + fields in interface files (:ghc-ticket:`22272`). + +- Make type equality ``(~)`` checks in the presence of quantified contrains more + robust to argument ordering (:ghc-ticket:`23333`). + +- Fix some segfaults when using ``UnliftedDataTypes`` (:ghc-ticket:`23231`, + :ghc-ticket:`23146`). + +- Improve bounds checking with ``-fcheck-prim-bounds`` (:ghc-ticket:`21054`). + +- Fix a bug in the simplifier leading to core lint errors (:ghc-ticket:`23012`). + +- Ensure array read operations have proper memory barries (:ghc-ticket:`23541`). + +- Fix a spurious ``-dcore-lint`` failure with certain kinds of type family + instances (:ghc-ticket:`22547`). + +- Fix a bug with ``.hie`` files containing spurious references to generated + functions in files with partial field selectors (:ghc-ticket:`23492`). + +- With the aarch64 backend, fix a bug arising from lack of zero-extension for + 8/16 bit add/sub with immediate (:ghc-ticket:`23749`). + +- Fix a number of bugs having to do with default representation polymorphic type + variables (:ghc-ticket:`23153`, :ghc-ticket:`23154`, :ghc-ticket:`23176`). + +GHCi and Bytecode Interpreter +----------------------------- + +- Add support for top-level ``Addr#`` literals (:ghc-ticket:`22376`) + +- Fix some tag inference bugs when using the bytecode interpreter + (:ghc-ticket:`22840`). + +- Support the ``foreign import prim`` calling convention in the + bytecode interpreter (:ghc-ticket:`22051`). + +- Support sized literals in the bytecode interpreter (:ghc-ticket:`21945`). + +- Fix a bug with the handling of unboxed tuples in the bytecode interpreter + (:ghc-ticket:`23068`). + +- Make the bytecode interpreter more robust when run on optimised code + (:ghc-ticket:`22958`) + +Runtime system +-------------- + +- Accurately account for mutator allocations when using the non-moving GC + (:ghc-ticket:`23312`). + +- Prevent some segfaults by ensuring that pinned allocations respect block size + (:ghc-ticket:`23400`). + +- Fix warnings with clang 14.0.3 (:ghc-ticket:`23561`). + +- On Windows, ensure reliability of IO manager shutdown (:ghc-ticket:`23691`). + +- Fix a bug with the GHC linker on windows (:ghc-ticket:`22941`). + +Build system and packaging +-------------------------- + +- Allow building documentation with sphinx 6.0.0 (:ghc-ticket:`22690`). + +- Fix a bug with the install scripts that prevented reinstallation of binary + distributions (:ghc-ticket:`23373`). + +- Fix some dependency tracking bugs with hadrian (:ghc-ticket:`23554`). + +Core libraries +-------------- + +- Bump ``base`` to 4.17.2.0 + +- base: Restore``mingwex`` dependency on Windows (:ghc-ticket:`23309`). + +- Bump ``process`` to 1.6.17.0 + +- Bump ``bytestring`` to 0.11.5.1 + +Included libraries +------------------ + +The package database provided with this distribution also contains a number of +packages other than GHC itself. See the changelogs provided with these packages +for further change information. + +.. ghc-package-list:: + + libraries/array/array.cabal: Dependency of ``ghc`` library + libraries/base/base.cabal: Core library + libraries/binary/binary.cabal: Dependency of ``ghc`` library + libraries/bytestring/bytestring.cabal: Dependency of ``ghc`` library + libraries/Cabal/Cabal/Cabal.cabal: Dependency of ``ghc-pkg`` utility + libraries/Cabal/Cabal-syntax/Cabal-syntax.cabal: Dependency of ``ghc-pkg`` utility + libraries/containers/containers/containers.cabal: Dependency of ``ghc`` library + libraries/deepseq/deepseq.cabal: Dependency of ``ghc`` library + libraries/directory/directory.cabal: Dependency of ``ghc`` library + libraries/exceptions/exceptions.cabal: Dependency of ``ghc`` and ``haskeline`` library + libraries/filepath/filepath.cabal: Dependency of ``ghc`` library + compiler/ghc.cabal: The compiler itself + libraries/ghci/ghci.cabal: The REPL interface + libraries/ghc-boot/ghc-boot.cabal: Internal compiler library + libraries/ghc-boot-th/ghc-boot-th.cabal: Internal compiler library + libraries/ghc-compact/ghc-compact.cabal: Core library + libraries/ghc-heap/ghc-heap.cabal: GHC heap-walking library + libraries/ghc-prim/ghc-prim.cabal: Core library + libraries/haskeline/haskeline.cabal: Dependency of ``ghci`` executable + libraries/hpc/hpc.cabal: Dependency of ``hpc`` executable + libraries/integer-gmp/integer-gmp.cabal: Core library + libraries/libiserv/libiserv.cabal: Internal compiler library + libraries/mtl/mtl.cabal: Dependency of ``Cabal`` library + libraries/parsec/parsec.cabal: Dependency of ``Cabal`` library + libraries/pretty/pretty.cabal: Dependency of ``ghc`` library + libraries/process/process.cabal: Dependency of ``ghc`` library + libraries/stm/stm.cabal: Dependency of ``haskeline`` library + libraries/template-haskell/template-haskell.cabal: Core library + libraries/terminfo/terminfo.cabal: Dependency of ``haskeline`` library + libraries/text/text.cabal: Dependency of ``Cabal`` library + libraries/time/time.cabal: Dependency of ``ghc`` library + libraries/transformers/transformers.cabal: Dependency of ``ghc`` library + libraries/unix/unix.cabal: Dependency of ``ghc`` library + libraries/Win32/Win32.cabal: Dependency of ``ghc`` library + libraries/xhtml/xhtml.cabal: Dependency of ``haddock`` executable + diff --git a/docs/users_guide/release-notes.rst b/docs/users_guide/release-notes.rst index 6eb4de36ba9c1dc7ea8aae3da70a47cc2ecbdf9b..c37ff458f6db9c63499e3efd14f975b70fe55579 100644 --- a/docs/users_guide/release-notes.rst +++ b/docs/users_guide/release-notes.rst @@ -4,6 +4,7 @@ Release notes .. toctree:: :maxdepth: 1 + 9.4.6-notes 9.4.5-notes 9.4.4-notes 9.4.3-notes diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal index 6f2d09f746520a0c3bccc81a002e41738783064c..4df1baed50a43248be8be664d6560a7dcb45eeee 100644 --- a/libraries/base/base.cabal +++ b/libraries/base/base.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: base -version: 4.17.1.0 +version: 4.17.2.0 -- NOTE: Don't forget to update ./changelog.md license: BSD-3-Clause diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md index a8a857923bb0e275d0e5211891871c6aeedde97d..2119d7381bd626deae2612cd0f9dad842d01c477 100644 --- a/libraries/base/changelog.md +++ b/libraries/base/changelog.md @@ -1,5 +1,11 @@ # Changelog for [`base` package](http://hackage.haskell.org/package/base) +## 4.17.2.0 *August 2023* + + * Restore `mingwex` dependency on Windows (#23309). + + * Fix an incorrect CPP guard on `darwin_HOST_OS`. + ## 4.17.1.0 *April 2023* * Remove `mingwex` dependency on Windows (#22166). diff --git a/libraries/ghc-prim/changelog.md b/libraries/ghc-prim/changelog.md index b585edfeb54fc70ed7fe67907b33d4c44a0b45b3..9ecda535d2db47051152ebd46a43bf4e7565598c 100644 --- a/libraries/ghc-prim/changelog.md +++ b/libraries/ghc-prim/changelog.md @@ -1,3 +1,8 @@ +## 0.9.1 *August 2023* + +- Shipped with GHC 9.4.6 +- Restore `mingwex` dependency on Windows (#23309) + ## 0.9.0 *August 2022* - Shipped with GHC 9.4.1 diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal index 44d294cb0061a0831715d4452963409af8142ae9..eae6868b5a2d9b3cece5f6f2a7cdf86f29c4be1a 100644 --- a/libraries/ghc-prim/ghc-prim.cabal +++ b/libraries/ghc-prim/ghc-prim.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: ghc-prim -version: 0.9.0 +version: 0.9.1 -- NOTE: Don't forget to update ./changelog.md license: BSD-3-Clause license-file: LICENSE diff --git a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout index 1df95aa276a1e86131fcb821712b7e1007495362..2855c50d8f9aba466d2cebd2d655960674dc3088 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout +++ b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout @@ -4,4 +4,4 @@ for bkpcabal01-0.1.0.0.. Preprocessing library 'q' for bkpcabal01-0.1.0.0.. Building library 'q' instantiated with H = <H> for bkpcabal01-0.1.0.0.. -[2 of 2] Instantiating bkpcabal01-0.1.0.0-GO2RFU1ABuuFdVdW0Tjnp2-p +[2 of 2] Instantiating bkpcabal01-0.1.0.0-9EeElPXCwbT1H2r14ZWyw3-p diff --git a/testsuite/tests/backpack/should_compile/bkp16.stderr b/testsuite/tests/backpack/should_compile/bkp16.stderr index 06d2865c24a5018f6afacd9ff4034f2dc19f5072..fa547b2df8543df2845b1991da32ed81a5ce2f9d 100644 --- a/testsuite/tests/backpack/should_compile/bkp16.stderr +++ b/testsuite/tests/backpack/should_compile/bkp16.stderr @@ -2,8 +2,8 @@ [1 of 1] Compiling Int[sig] ( p/Int.hsig, nothing ) [2 of 2] Processing q Instantiating q - [1 of 1] Including p[Int=base-4.17.0.0:GHC.Exts] - Instantiating p[Int=base-4.17.0.0:GHC.Exts] - [1 of 1] Including ghc-prim-0.9.0 + [1 of 1] Including p[Int=base-4.17.2.0:GHC.Exts] + Instantiating p[Int=base-4.17.2.0:GHC.Exts] + [1 of 1] Including ghc-prim-0.9.1 [1 of 1] Compiling Int[sig] ( p/Int.hsig, bkp16.out/p/p-97PZnzqiJmd2hTwUNGdjod/Int.o ) [1 of 1] Instantiating p diff --git a/testsuite/tests/cabal/t18567/T18567.stderr b/testsuite/tests/cabal/t18567/T18567.stderr index 56f76970564559e6268762df08e98e790d59a010..a94ebe33d97136a55a34d94e12803af68a77bbf8 100644 --- a/testsuite/tests/cabal/t18567/T18567.stderr +++ b/testsuite/tests/cabal/t18567/T18567.stderr @@ -2,4 +2,4 @@ <no location info>: warning: [-Wunused-packages] The following packages were specified via -package or -package-id flags, but were not needed for compilation: - - internal-lib-0.1.0.0 (exposed by flag -package-id internal-lib-0.1.0.0-KHXAr3TZBfL9KKz9idkWKi-sublib-unused) + - internal-lib-0.1.0.0 (exposed by flag -package-id internal-lib-0.1.0.0-6LFEauuQzmN1lhf9BsFCch-sublib-unused) diff --git a/testsuite/tests/dependent/should_compile/T14729.stderr b/testsuite/tests/dependent/should_compile/T14729.stderr index 7070bd1d931de23ee919489ab90d69fc366cd1e5..c83ccdeadc326b82a2f6f362a880d3700d16f88d 100644 --- a/testsuite/tests/dependent/should_compile/T14729.stderr +++ b/testsuite/tests/dependent/should_compile/T14729.stderr @@ -11,4 +11,4 @@ COERCION AXIOMS FAMILY INSTANCES type instance F Int = Bool -- Defined at T14729.hs:10:15 Dependent modules: [] -Dependent packages: [base-4.17.1.0] +Dependent packages: [base-4.17.2.0] diff --git a/testsuite/tests/dependent/should_compile/T15743.stderr b/testsuite/tests/dependent/should_compile/T15743.stderr index 54daf4c2ccd6694bc20f3429aa4fe1351e300cf6..8982c25c8080a20f65a1c2b83e88e58feca02b2e 100644 --- a/testsuite/tests/dependent/should_compile/T15743.stderr +++ b/testsuite/tests/dependent/should_compile/T15743.stderr @@ -3,4 +3,4 @@ TYPE CONSTRUCTORS forall {k1} k2 (k3 :: k2). Proxy k3 -> k1 -> k2 -> * roles nominal nominal nominal phantom phantom phantom Dependent modules: [] -Dependent packages: [base-4.17.1.0] +Dependent packages: [base-4.17.2.0] diff --git a/testsuite/tests/dependent/should_compile/T15743e.stderr b/testsuite/tests/dependent/should_compile/T15743e.stderr index e2b4b421ba29c9bba0aa9ac8e0a67719a56d9d31..a71d93ed7397ec9287dc9cdc86e51426b3bd361e 100644 --- a/testsuite/tests/dependent/should_compile/T15743e.stderr +++ b/testsuite/tests/dependent/should_compile/T15743e.stderr @@ -54,4 +54,4 @@ DATA CONSTRUCTORS (d :: Proxy k5) (e :: Proxy k7). f c -> T k8 a b f c d e Dependent modules: [] -Dependent packages: [base-4.17.1.0] +Dependent packages: [base-4.17.2.0] diff --git a/testsuite/tests/indexed-types/should_compile/T15711.stderr b/testsuite/tests/indexed-types/should_compile/T15711.stderr index fa73017955852681aabedaccd4f07eec4072ae72..9ea1852cbcb94d635b0fb44ccfbe3fd851bbfd02 100644 --- a/testsuite/tests/indexed-types/should_compile/T15711.stderr +++ b/testsuite/tests/indexed-types/should_compile/T15711.stderr @@ -3,4 +3,4 @@ TYPE CONSTRUCTORS associated type family F{2} :: forall a. Maybe a -> * roles nominal nominal Dependent modules: [] -Dependent packages: [base-4.17.1.0] +Dependent packages: [base-4.17.2.0] diff --git a/testsuite/tests/indexed-types/should_compile/T15852.stderr b/testsuite/tests/indexed-types/should_compile/T15852.stderr index d0c57ec9b887c6fdaf753e324461a984b16a7604..42029b78d97e9293346b40b6b906bec15ce3df02 100644 --- a/testsuite/tests/indexed-types/should_compile/T15852.stderr +++ b/testsuite/tests/indexed-types/should_compile/T15852.stderr @@ -9,4 +9,4 @@ FAMILY INSTANCES data instance forall {k1} {k2} {c :: k1} {j :: k2}. DF (Proxy c) -- Defined at T15852.hs:10:15 Dependent modules: [] -Dependent packages: [base-4.17.1.0] +Dependent packages: [base-4.17.2.0] diff --git a/testsuite/tests/polykinds/T15592.stderr b/testsuite/tests/polykinds/T15592.stderr index 7d498a88261e00108bcf1554a4c48d23ff507791..82350248cd50e4e8209e70ea544f9135cf47ebf8 100644 --- a/testsuite/tests/polykinds/T15592.stderr +++ b/testsuite/tests/polykinds/T15592.stderr @@ -5,4 +5,4 @@ DATA CONSTRUCTORS MkT :: forall {k} k1 (f :: k1 -> k -> *) (a :: k1) (b :: k). f a b -> T f a b -> T f a b Dependent modules: [] -Dependent packages: [base-4.17.1.0] +Dependent packages: [base-4.17.2.0] diff --git a/testsuite/tests/polykinds/T15592b.stderr b/testsuite/tests/polykinds/T15592b.stderr index 3847815d47400224626ac67083d5341445abd6fc..fe28d9024f68d14de8e5439318580a95326c938f 100644 --- a/testsuite/tests/polykinds/T15592b.stderr +++ b/testsuite/tests/polykinds/T15592b.stderr @@ -4,4 +4,4 @@ TYPE CONSTRUCTORS forall k (f :: k -> *) (a :: k). f a -> * roles nominal nominal nominal nominal Dependent modules: [] -Dependent packages: [base-4.17.1.0] +Dependent packages: [base-4.17.2.0] diff --git a/testsuite/tests/printer/T18052a.stderr b/testsuite/tests/printer/T18052a.stderr index e6c5e237e636da22e08019530783557b10ed1944..2d98da6e4c1bb44b81332aee40282d9885f3a3a0 100644 --- a/testsuite/tests/printer/T18052a.stderr +++ b/testsuite/tests/printer/T18052a.stderr @@ -6,7 +6,7 @@ TYPE CONSTRUCTORS PATTERN SYNONYMS (:||:) :: forall {a} {b}. a -> b -> (a, b) Dependent modules: [] -Dependent packages: [base-4.17.1.0] +Dependent packages: [base-4.17.2.0] ==================== Tidy Core ==================== Result size of Tidy Core diff --git a/testsuite/tests/rep-poly/RepPolyPatBind.stderr b/testsuite/tests/rep-poly/RepPolyPatBind.stderr index 007ce3c5db65ae58b986d333ee5f999c1df5be53..69b44611e3a1116eaa1e3d6249a26fc5098d59b5 100644 --- a/testsuite/tests/rep-poly/RepPolyPatBind.stderr +++ b/testsuite/tests/rep-poly/RepPolyPatBind.stderr @@ -18,11 +18,11 @@ RepPolyPatBind.hs:18:5: error: (# x, y #) = undefined in x -RepPolyPatBind.hs:18:8: error: [GHC-55287] +RepPolyPatBind.hs:18:8: error: • The pattern binding does not have a fixed runtime representation. Its type is: - (# a0, b0 #) :: TYPE (TupleRep [k00, k10]) - Cannot unify ‘rep’ with the type variable ‘k00’ + (# a0, b0 #) :: TYPE ('TupleRep '[c0, c1]) + Cannot unify ‘rep’ with the type variable ‘c0’ because it is not a concrete ‘RuntimeRep’. • In the pattern: (# x, y #) In a pattern binding: (# x, y #) = undefined @@ -34,11 +34,11 @@ RepPolyPatBind.hs:18:8: error: [GHC-55287] • Relevant bindings include foo :: () -> a (bound at RepPolyPatBind.hs:15:1) -RepPolyPatBind.hs:18:11: error: [GHC-55287] +RepPolyPatBind.hs:18:11: error: • The pattern binding does not have a fixed runtime representation. Its type is: - (# a0, b0 #) :: TYPE (TupleRep [k00, k10]) - Cannot unify ‘rep’ with the type variable ‘k10’ + (# a0, b0 #) :: TYPE ('TupleRep '[c0, c1]) + Cannot unify ‘rep’ with the type variable ‘c1’ because it is not a concrete ‘RuntimeRep’. • In the pattern: (# x, y #) In a pattern binding: (# x, y #) = undefined diff --git a/testsuite/tests/th/T21547.stderr b/testsuite/tests/th/T21547.stderr index 95c4ab81ca4533e7e90cccbbc9c2dda2af998c82..e7485f7ee7ed88cf8c0dc00b93f7853d04d1916b 100644 --- a/testsuite/tests/th/T21547.stderr +++ b/testsuite/tests/th/T21547.stderr @@ -1,7 +1,7 @@ T21547.hs:9:14: error: • GHC stage restriction: - instance for ‘base-4.17.1.0:Data.Typeable.Internal.Typeable + instance for ‘base-4.17.2.0:Data.Typeable.Internal.Typeable T’ is used in a top-level splice, quasi-quote, or annotation, and must be imported, not defined locally • In the expression: foo [|| T () ||] diff --git a/testsuite/tests/typecheck/should_compile/T12763.stderr b/testsuite/tests/typecheck/should_compile/T12763.stderr index 59003dd42129b3802019cfae60c1a13f2a73276a..d1d3e50f0ed2ad6a37f75dc89f47b99669465b8d 100644 --- a/testsuite/tests/typecheck/should_compile/T12763.stderr +++ b/testsuite/tests/typecheck/should_compile/T12763.stderr @@ -8,4 +8,4 @@ COERCION AXIOMS CLASS INSTANCES instance C Int -- Defined at T12763.hs:9:10 Dependent modules: [] -Dependent packages: [base-4.17.1.0] +Dependent packages: [base-4.17.2.0] diff --git a/testsuite/tests/typecheck/should_compile/T18406b.stderr b/testsuite/tests/typecheck/should_compile/T18406b.stderr index 8a2001c52721d48e4cd4053b63f18e1a2ab71b0e..d372203bb9ef8a8072785fb8579b9bbbc4ea57da 100644 --- a/testsuite/tests/typecheck/should_compile/T18406b.stderr +++ b/testsuite/tests/typecheck/should_compile/T18406b.stderr @@ -6,7 +6,7 @@ TYPE CONSTRUCTORS COERCION AXIOMS axiom Bug.N:C :: forall a b. C a b = a -> a Dependent modules: [] -Dependent packages: [base-4.17.1.0] +Dependent packages: [base-4.17.2.0] ==================== Typechecker ==================== Bug.$tcC diff --git a/testsuite/tests/typecheck/should_compile/T18529.stderr b/testsuite/tests/typecheck/should_compile/T18529.stderr index 1a706c8e6c7345b77dbf5cc8dcbd7dc069338cc7..b6fb01bb0e169a72405862dc9ee2af75c75d844f 100644 --- a/testsuite/tests/typecheck/should_compile/T18529.stderr +++ b/testsuite/tests/typecheck/should_compile/T18529.stderr @@ -6,7 +6,7 @@ TYPE CONSTRUCTORS COERCION AXIOMS axiom Bug.N:C :: forall a b. C a b = a -> b -> () Dependent modules: [] -Dependent packages: [base-4.17.1.0] +Dependent packages: [base-4.17.2.0] ==================== Typechecker ==================== Bug.$tcC diff --git a/testsuite/tests/typecheck/should_compile/T21023.stderr b/testsuite/tests/typecheck/should_compile/T21023.stderr index 8ea96eb233f3b2fe7926d83d6ad36cd7df1ae484..e8db724c5b411a4eef2b1ede4ea2d541616a138d 100644 --- a/testsuite/tests/typecheck/should_compile/T21023.stderr +++ b/testsuite/tests/typecheck/should_compile/T21023.stderr @@ -2,4 +2,4 @@ TYPE SIGNATURES f :: forall {a}. a -> (a, Integer) x :: Integer Dependent modules: [] -Dependent packages: [base-4.17.1.0] +Dependent packages: [base-4.17.2.0] diff --git a/testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr b/testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr index a3c35eeb607d3b0c54ab3d924aca45e968885d75..43ae513d65aa94363ad26b676f4d0bf865137ce4 100644 --- a/testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr +++ b/testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr @@ -8,10 +8,10 @@ subsumption_sort_hole_fits.hs:2:5: warning: [-Wtyped-holes (in -Wdefault)] Valid hole fits include lines :: String -> [String] (imported from ‘Prelude’ at subsumption_sort_hole_fits.hs:1:1 - (and originally defined in ‘base-4.17.1.0:Data.OldList’)) + (and originally defined in ‘base-4.17.2.0:Data.OldList’)) words :: String -> [String] (imported from ‘Prelude’ at subsumption_sort_hole_fits.hs:1:1 - (and originally defined in ‘base-4.17.1.0:Data.OldList’)) + (and originally defined in ‘base-4.17.2.0:Data.OldList’)) read :: forall a. Read a => String -> a with read @[String] (imported from ‘Prelude’ at subsumption_sort_hole_fits.hs:1:1 diff --git a/testsuite/tests/typecheck/should_fail/VtaFail.stderr b/testsuite/tests/typecheck/should_fail/VtaFail.stderr index e7af291f084404236a9bde8f0cff99da17e4aa10..87a2bea3fe949415ac5e0b81f63a07c5bc1af324 100644 --- a/testsuite/tests/typecheck/should_fail/VtaFail.stderr +++ b/testsuite/tests/typecheck/should_fail/VtaFail.stderr @@ -6,7 +6,7 @@ VtaFail.hs:7:16: error: In an equation for ‘answer_nosig’: answer_nosig = pairup_nosig @Int @Bool 5 True -VtaFail.hs:14:17: error: [GHC-95781] +VtaFail.hs:14:17: error: • Cannot apply expression of type ‘p0 -> p0’ to a visible type argument ‘Int’ • In the expression: (\ x -> x) @Int 12