[Git][ghc/ghc][wip/az/epa-warning-category] 14 commits: Bump Cabal submodule

Mon Aug 28 11:16:11 UTC 2023

Alan Zimmerman pushed to branch wip/az/epa-warning-category at Glasgow Haskell Compiler / GHC

Commits:
9e4c9647 by Ben Gamari at 2023-08-22T14:17:51-04:00
Bump Cabal submodule

Back to 3.10 as we will be shipping a minor release of Cabal 3.10 with
GHC 9.8.

- - - - -
4aeff0d3 by Ben Gamari at 2023-08-22T14:17:51-04:00
Bump haddock submodule

- - - - -
bb87c1e7 by Matthew Craven at 2023-08-22T14:17:51-04:00
Bump bytestring submodule to 0.11.5, again

Fixes #23789.

The bytestring commit used here is unreleased;
a release can be made when necessary.

(cherry picked from commit bf885d7a1a27e7b1cc34335a1e16d699fe084b47)

- - - - -
03bbb5df by Ben Gamari at 2023-08-22T14:17:51-04:00
relnotes: Note text breakage

See #23758.

- - - - -
a380917e by Ben Gamari at 2023-08-22T14:17:51-04:00
Revert "users_guide: Restore compatibility with pre-packaging Python"

This reverts commit 291963af49a12a05c40d9ed6fd000cba8b15595b.

- - - - -
154dbdfc by Ben Gamari at 2023-08-22T14:17:51-04:00
users-guide: Support both distutils and packaging

As noted in #23818, some old distributions (e.g. Debian 9) only include
`distutils` while newer distributions only include `packaging`.

Fixes #23818.

(cherry picked from commit d814bda97994df01139c2a9bcde915dc86ef2927)

- - - - -
b4f85f6e by Ben Gamari at 2023-08-22T14:17:51-04:00
users-guide: Ensure extlinks is compatible with Sphinx <4

The semantics of the `extlinks` attribute annoyingly changed in Sphinx
4. Reflect this in our configuration. See #22690.

Fixes #23807.

(cherry picked from commit 1726db3f39f1c41b92b1bdf45e9dc054b401e782)

- - - - -
a3623053 by Sylvain Henry at 2023-08-22T14:17:51-04:00
JS: implement openat(AT_FDCWD...) (#23697)

Use `openSync` to implement `openat(AT_FDCWD...)`.

(cherry picked from commit e2b381154c0f89a4ee23190e2e7d7cae105587e6)

- - - - -
01353b12 by sheaf at 2023-08-22T14:17:51-04:00
Use unsatisfiable for missing methods w/ defaults

When a class instance has an Unsatisfiable constraint in its context
and the user has not explicitly provided an implementation of a method,
we now always provide a RHS of the form `unsatisfiable @msg`, even
if the method has a default definition available. This ensures that,
when deferring type errors, users get the appropriate error message
instead of a possible runtime loop, if class default methods were
defined recursively.

Fixes #23816

(cherry picked from commit a975c6634b0d202b21e0e719efb9900e44f85392)

- - - - -
e5e5e3ed by Gergő Érdi at 2023-08-22T14:17:51-04:00
If a defaulting plugin made progress, re-zonk wanteds before built-in defaulting

Fixes #23821.

(cherry picked from commit a6828173b90dbd276be593c1690aa34317c13c72)

- - - - -
20d3ed02 by Matthew Pickering at 2023-08-22T14:17:51-04:00
packaging: Build manpage in separate directory to other documentation

We were installing two copies of the manpage:

* One useless one in the `share/doc` folder, because we copy the doc/
  folder into share/
* The one we deliberately installed into `share/man` etc

The solution is to build the manpage into the `manpage` directory when
building the bindist, and then just install it separately.

Fixes #23707

(cherry picked from commit 026f040ad0297cd1b735307656b8f5cf33d1e71e)

- - - - -
738c7935 by Ben Gamari at 2023-08-22T14:17:51-04:00
hadrian: Always canonicalize topDirectory

Hadrian's `topDirectory` is intended to provide an absolute path to the
root of the GHC tree. However, if the tree is reached via a symlink this

One question here is whether the `canonicalizePath` call is expensive
enough to warrant caching. In a quick microbenchmark I observed that
`canonicalizePath "."` takes around 10us per call; this seems
sufficiently low not to worry.

Alternatively, another approach here would have been to rather move the
canonicalization into `m4/fp_find_root.m4`. This would have avoided
repeated canonicalization but sadly path canonicalization is a hard
problem in POSIX shell.

Addresses #22451.

(cherry picked from commit 5efa9ca545d8d33b9be4fc0ba91af1db38f19276)

- - - - -
f3e2a69a by Gergő Érdi at 2023-08-22T14:17:51-04:00
Add flag to `-f{no-}specialise-incoherents` to enable/disable specialisation of incoherent instances

Fixes #23287

(cherry picked from commit 481f4a46a4efccff7242afcdda42c8df6325117f)

- - - - -
d68e3113 by Alan Zimmerman at 2023-08-28T12:14:23+01:00
EPA: Keep track of "in" token for WarningTxt category

A warning can now be written with a category, e.g.

    {-# WARNInG in "x-c" e "d" #-}

Keep track of the location of the 'in' keyword and string, as well as
the original SourceText of the label, in case it uses character escapes.

(cherry picked from commit a936f244934b78edb24d7462057670dbec72e938)

- - - - -

30 changed files:

- .gitlab-ci.yml
- compiler/GHC/Core/InstEnv.hs
- compiler/GHC/Driver/DynFlags.hs
- compiler/GHC/Driver/Flags.hs
- compiler/GHC/Driver/Session.hs
- compiler/GHC/Hs/Decls.hs
- compiler/GHC/HsToCore/Binds.hs
- compiler/GHC/HsToCore/Monad.hs
- compiler/GHC/HsToCore/Quote.hs
- compiler/GHC/HsToCore/Types.hs
- compiler/GHC/Iface/Make.hs
- compiler/GHC/Iface/Syntax.hs
- compiler/GHC/Parser.y
- compiler/GHC/Rename/Module.hs
- compiler/GHC/Tc/Errors.hs
- compiler/GHC/Tc/Gen/Splice.hs
- compiler/GHC/Tc/Instance/Class.hs
- compiler/GHC/Tc/Solver.hs
- compiler/GHC/Tc/Solver/Dict.hs
- compiler/GHC/Tc/Solver/Equality.hs
- compiler/GHC/Tc/Solver/Irred.hs
- compiler/GHC/Tc/Solver/Monad.hs
- compiler/GHC/Tc/Solver/Solve.hs
- compiler/GHC/Tc/TyCl/Instance.hs
- compiler/GHC/Tc/Types/Evidence.hs
- compiler/GHC/Tc/Utils/Instantiate.hs
- compiler/GHC/Types/Basic.hs
- compiler/GHC/Unit/Module/Warnings.hs
- compiler/GHC/Utils/Binary.hs
- compiler/Language/Haskell/Syntax/Concrete.hs

The diff was not included because it is too large.

View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/bbd97032c030429eb15e60d0832d7eccc02fdcc5...d68e31139dd82ecea0e89a0c1b87bd6e881a6fec

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/bbd97032c030429eb15e60d0832d7eccc02fdcc5...d68e31139dd82ecea0e89a0c1b87bd6e881a6fec
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/20230828/26854639/attachment-0001.html>