[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 4 commits: Remove ConDeclGADTPrefixPs

[Marge Bot]

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


Commits:
22641742 by Ryan Scott at 2020-08-02T16:44:11-04:00
Remove ConDeclGADTPrefixPs

This removes the `ConDeclGADTPrefixPs` per the discussion in #18517.
Most of this patch simply removes code, although the code in the
`rnConDecl` case for `ConDeclGADTPrefixPs` had to be moved around a
bit:

* The nested `forall`s check now lives in the `rnConDecl` case for
  `ConDeclGADT`.
* The `LinearTypes`-specific code that used to live in the
  `rnConDecl` case for `ConDeclGADTPrefixPs` now lives in
  `GHC.Parser.PostProcess.mkGadtDecl`, which is now monadic so that
  it can check if `-XLinearTypes` is enabled.

Fixes #18157.

- - - - -
f2d1accf by Leon Schoorl at 2020-08-02T16:44:47-04:00
Fix GHC_STAGE definition generated by make

Fixes #18070

GHC_STAGE is the stage of the compiler we're building, it should be 1,2(,3?).
But make was generating 0 and 1.

Hadrian does this correctly using a similar `+ 1`:
https://gitlab.haskell.org/ghc/ghc/-/blob/eb8115a8c4cbc842b66798480fefc7ab64d31931/hadrian/src/Rules/Generate.hs#L245

- - - - -
991b7bc9 by Hécate at 2020-08-03T07:49:57-04:00
Remove all the unnecessary LANGUAGE pragmas

- - - - -
9681b392 by Ryan Scott at 2020-08-03T07:49:57-04:00
Make CodeQ and TExpQ levity polymorphic

The patch is quite straightforward. The only tricky part is that
`Language.Haskell.TH.Lib.Internal` now must be `Trustworthy` instead
of `Safe` due to the `GHC.Exts` import (in order to import `TYPE`).

Since `CodeQ` has yet to appear in any released version of
`template-haskell`, I didn't bother mentioning the change to `CodeQ`
in the `template-haskell` release notes.

Fixes #18521.

- - - - -


30 changed files:

- compiler/GHC/Hs/Decls.hs
- compiler/GHC/Hs/Instances.hs
- compiler/GHC/Hs/Type.hs
- compiler/GHC/Hs/Utils.hs
- compiler/GHC/Parser.y
- compiler/GHC/Parser/PostProcess.hs
- compiler/GHC/Parser/PostProcess/Haddock.hs
- compiler/GHC/Rename/Module.hs
- compiler/GHC/ThToHs.hs
- includes/ghc.mk
- libraries/base/.hlint.yaml
- libraries/base/Control/Concurrent/QSemN.hs
- libraries/base/Control/Exception/Base.hs
- libraries/base/Data/Coerce.hs
- libraries/base/Data/Complex.hs
- libraries/base/Data/Data.hs
- libraries/base/Data/Dynamic.hs
- libraries/base/Data/Either.hs
- libraries/base/Data/Functor/Compose.hs
- libraries/base/Data/Functor/Contravariant.hs
- libraries/base/Data/Functor/Identity.hs
- libraries/base/Data/IORef.hs
- libraries/base/Data/List/NonEmpty.hs
- libraries/base/Data/Semigroup.hs
- libraries/base/Data/Type/Bool.hs
- libraries/base/Data/Type/Coercion.hs
- libraries/base/Data/Type/Equality.hs
- libraries/base/Data/Typeable.hs
- libraries/base/Data/Unique.hs
- libraries/base/Data/Void.hs


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/94bfcb1c7e77d0624990c7330ff019d84c2d87c5...9681b3928e8a938b606bfbcdcc4d57f7c653ff17

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/94bfcb1c7e77d0624990c7330ff019d84c2d87c5...9681b3928e8a938b606bfbcdcc4d57f7c653ff17
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/20200803/141e13d9/attachment.html>