[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 4 commits: user_guide: Note -pgmP/-optP are for /Haskell/-CPP

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
023f36f5 by Rodrigo Mesquita at 2025-01-10T14:57:48-05:00
user_guide: Note -pgmP/-optP are for /Haskell/-CPP

Fixes #25574

- - - - -
e1c133f2 by Ben Gamari at 2025-01-10T14:58:25-05:00
dump-decls: Suppress unit-ids

While the testsuite driver already normalizes these away, they are
nevertheless a severe nuisance when diffing outside of the testsuite.

Intriguingly, this doesn't completely eliminate the unit IDs; some
wired-in names are still printed. However, this is a cheap and helpful
improvement over the status quo so I am simply going to accept this.

Fixes #25334.

- - - - -
15b243c0 by Mike Pilgrem at 2025-01-11T08:44:11-05:00
Re CLC #300 - Specify fmap for NonEmpty as map

See:
* https://github.com/haskell/core-libraries-committee/issues/300

Seeks to:
* move existing instances for NonEmpty (except of Eq and Ord) out of GHC.Internal.Base into new GHC.Internal.Data.NonEmpty (to avoid otherwise unavoidable cycles in the module graph);
* move map out of Data.List.NonEmpty (base package) into GHC.Internal.Data.NonEmpty;
* define fmap as map for NonEmpty instance of Functor, avoiding code duplication;
* re-export map from existing GHC.Internal.Data.List.NonEmpty; and
* re-export map from Data.List.NonEmpty (base package);

without breaking anything in the GHC repository.

Various tests *.stdout and *.stderr files are amended also.

- - - - -
669b8b42 by Patrick at 2025-01-11T08:44:12-05:00
Fix #25611. Enhances the kind inference for data family instances,
by including the RHS's constraints when kind-checking LHS.

Type checker changes:
In `tcDataFamInstHeader`, `kcConDecls` the H98-style decls
and newtype decls, even those in GADT syntax, but NOT for
general GADT decls.

Testsuite changes:
1. The test to ensure kind specialization remains correctly handled even
   if we include the RHS's constrains:
      * T25611d
2. Infer result kind from datacon.
      * H98 newtype case: T25611a
      * H98 data case: T25611b
3. Two tests with additional errors report:
      * UnliftedNewtypesFamilyKindFail2
      * UnliftedNewtypesInstanceFail
4. Due to better kind inference,
   move should_fail test UnliftedNewtypesUnassociatedFamilyFail
   to should_compile test T25611c.
5. Additional test to we default the kind of the data instance correctly
   without UnliftedNewtypes or UnliftedDatatypes:
      * DataInstanceKindsDefaults

Also a few notes are updated to reflect the changes.

Co-authored-by: Simon Peyton Jones <simon.peytonjones at gmail.com>

- - - - -


30 changed files:

- compiler/GHC/Tc/Gen/HsType.hs
- compiler/GHC/Tc/TyCl.hs
- compiler/GHC/Tc/TyCl/Instance.hs
- docs/users_guide/phases.rst
- libraries/base/changelog.md
- libraries/base/src/Data/List/NonEmpty.hs
- libraries/base/src/Data/Semigroup.hs
- libraries/base/src/GHC/Base.hs
- libraries/ghc-internal/ghc-internal.cabal.in
- libraries/ghc-internal/src/GHC/Internal/Base.hs
- libraries/ghc-internal/src/GHC/Internal/Control/Monad/Fix.hs
- libraries/ghc-internal/src/GHC/Internal/Control/Monad/Zip.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Data.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Foldable.hs
- libraries/ghc-internal/src/GHC/Internal/Data/List/NonEmpty.hs
- + libraries/ghc-internal/src/GHC/Internal/Data/NonEmpty.hs
- libraries/ghc-internal/src/GHC/Internal/Data/Traversable.hs
- libraries/ghc-internal/src/GHC/Internal/Generics.hs
- libraries/ghc-internal/src/GHC/Internal/TH/Lib.hs
- libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs
- libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs
- libraries/ghc-internal/src/GHC/Internal/Text/ParserCombinators/ReadP.hs
- + testsuite/tests/indexed-types/should_compile/dataInstanceKindsDefaults.hs
- testsuite/tests/indexed-types/should_fail/all.T
- testsuite/tests/interface-stability/base-exports.stdout
- testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs
- testsuite/tests/interface-stability/base-exports.stdout-mingw32
- testsuite/tests/interface-stability/base-exports.stdout-ws-32
- testsuite/tests/interface-stability/ghc-experimental-exports.stdout
- testsuite/tests/interface-stability/ghc-experimental-exports.stdout-mingw32


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1c80092a23f01279cca64e5907787e10137904a4...669b8b42c0d913d8a9b30570eb3169e79313c3f3

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1c80092a23f01279cca64e5907787e10137904a4...669b8b42c0d913d8a9b30570eb3169e79313c3f3
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/20250111/4cfc96e4/attachment.html>