[Git][ghc/ghc][wip/p547] 3 commits: Fix merge conflict in T18355.stderr

[Richard Eisenberg (@rae)]

Richard Eisenberg pushed to branch wip/p547 at Glasgow Haskell Compiler / GHC


Commits:
e160cf47 by Krzysztof Gogolewski at 2022-11-12T08:05:28-05:00
Fix merge conflict in T18355.stderr

Fixes #22446

- - - - -
0c12ceb4 by Richard Eisenberg at 2022-11-13T19:30:49+00:00
Drop support for kind constraints.

This implements GHC proposal 547 and closes ticket #22298.

See the proposal and ticket for motivation.

- - - - -
a1f88556 by Richard Eisenberg at 2022-11-28T11:35:44-05:00
Drop support for kind constraints.

This implements proposal 547 and closes ticket #22298.
See the proposal and ticket for motivation.

- - - - -


30 changed files:

- compiler/GHC/Core/DataCon.hs
- compiler/GHC/Core/TyCo/Rep.hs
- compiler/GHC/Core/TyCon.hs
- compiler/GHC/Core/Type.hs
- compiler/GHC/CoreToIface.hs
- compiler/GHC/Iface/Type.hs
- compiler/GHC/Rename/HsType.hs
- compiler/GHC/Rename/Module.hs
- compiler/GHC/Tc/Errors/Ppr.hs
- compiler/GHC/Tc/Errors/Types.hs
- compiler/GHC/Tc/Gen/HsType.hs
- compiler/GHC/Tc/Solver/Rewrite.hs
- compiler/GHC/Tc/TyCl.hs
- compiler/GHC/Tc/Utils/Instantiate.hs
- compiler/GHC/Tc/Utils/TcType.hs
- compiler/GHC/Tc/Validity.hs
- compiler/GHC/Types/Var.hs
- docs/users_guide/exts/data_kinds.rst
- testsuite/tests/dependent/should_compile/all.T
- testsuite/tests/dependent/should_fail/T13780a.stderr
- testsuite/tests/dependent/should_compile/T14845_compile.hs → testsuite/tests/dependent/should_fail/T14845_compile.hs
- + testsuite/tests/dependent/should_fail/T14845_compile.stderr
- testsuite/tests/dependent/should_fail/all.T
- testsuite/tests/saks/should_compile/all.T
- testsuite/tests/saks/should_fail/all.T
- testsuite/tests/saks/should_compile/saks007.hs → testsuite/tests/saks/should_fail/saks007.hs
- + testsuite/tests/saks/should_fail/saks007.stderr
- testsuite/tests/saks/should_fail/saks007_fail.stderr
- testsuite/tests/simplCore/should_compile/T18355.stderr
- testsuite/tests/typecheck/should_compile/all.T


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/54c9a8b759e8db0cf39467e74619a6f75a3a2a74...a1f8855649454636a9544fbed5155b84aa8688e5

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/54c9a8b759e8db0cf39467e74619a6f75a3a2a74...a1f8855649454636a9544fbed5155b84aa8688e5
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221128/3d414a99/attachment.html>