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

Commits:

• 141986e3
  by mangoiv at 2026-06-24T15:51:14-04:00

  compiler: refactor error reporting code for ExplicitLevelImports
  
  Refactors error reporting code for ExplicitLevelImports to pass in a
  RdrName and a GlobalReaderElt to be able to report errors that are
  faithful to the source and to more precisely distinguish between names
  that are in scope from different qualifications.
  
  Fixes #27385 and #26616
  

• aa7df6b6
  by Simon Hengel at 2026-06-24T15:52:18-04:00

  Set GHC_VERSION when calling custom pre-processors (see #25952)
  
  (so that pre-processors can emit backwards compatible code)
  

• a9e494f2
  by Simon Hengel at 2026-06-24T15:54:08-04:00

  Add a flag to control GHCi specific error hints (close #27409)
  

• a805b2a2
  by Simon Hengel at 2026-06-24T15:55:20-04:00

  Reference correct package in error messages for reexported modules
  
  (fixes #27417)
  

• ccf9b3a9
  by Marc Scholten at 2026-06-24T16:28:51-04:00

  haddock: use Text in documentation pipeline
  
  This patch moves Haddock's documentation pipeline from String to Text
  where the data is already textual. It avoids repeated conversions while
  keeping the existing decoding behavior for invalid UTF-8 docstring
  chunks.
  
  The main changes are:
  
  * Render and carry docstrings as Text in Haddock-facing paths.
  * Use the Binary Text instance from GHC.Utils.Binary for Haddock
    interface files, and bump the Haddock binary interface version.
  * Add a FastString HTML instance so XHTML rendering avoids
    intermediate String allocation.
  * Keep HsDocStringChunk decoding lenient, matching the previous
    unpackHDSC behavior on invalid UTF-8 input.
  * Update the xhtml submodule to 3000.4.1.0, which contains the
    apostrophe escaping fix used by the Haddock test output.
  
  Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
  Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
  Assisted-by: Codex <codex@openai.com>
  

• bc1e735d
  by mangoiv at 2026-06-24T16:28:52-04:00

  compiler: rename ZonkAny to UnusedType and add pretty printing logic
  
  ZonkAny is a hard to understand name for users who do not know how the
  compiler works internally. Additionally, it is confusing that ZonkAny,
  while being a concrete type *represents* a meta variable, espeically in
  the compiler output.
  This patch changes the name of ZonkAny to UnusedType which is closer to
  its intended semantics and adds special pretty printing logic to display
  this type in the same fashion the compiler displays meta variables in
  other places, whenever they leak from the implementation to the user.
  It also exports the type from ghc-internal:GHC.Internal.Types in order
  to expose documentation.
  
  Fixes #27390
  
  Co-Authored-By: Sam Derbyshire <sam.derbyshire@gmail.com>
  

146 changed files:

• + changelog.d/26616
• + changelog.d/interactive-error-hints
• + changelog.d/pp-set-ghc-version
• + changelog.d/reexported-module-errors
• + changelog.d/unused-type
• compiler/GHC/Builtin/Names.hs
• compiler/GHC/Builtin/Types.hs
• compiler/GHC/Driver/DynFlags.hs
• compiler/GHC/Driver/Flags.hs
• compiler/GHC/Driver/Session.hs
• compiler/GHC/Hs/DocString.hs
• compiler/GHC/Hs/Expr.hs
• compiler/GHC/HsToCore/Expr.hs
• compiler/GHC/Iface/Errors.hs
• compiler/GHC/Iface/Errors/Ppr.hs
• compiler/GHC/Iface/Errors/Types.hs
• compiler/GHC/Iface/Type.hs
• compiler/GHC/Rename/Env.hs
• compiler/GHC/Rename/Expr.hs
• compiler/GHC/Rename/HsType.hs
• compiler/GHC/Rename/Module.hs
• compiler/GHC/Rename/Pat.hs
• compiler/GHC/Rename/Splice.hs
• compiler/GHC/Rename/Splice.hs-boot
• compiler/GHC/Rename/Unbound.hs
• compiler/GHC/SysTools/Tasks.hs
• compiler/GHC/Tc/Errors.hs
• compiler/GHC/Tc/Errors/Ppr.hs
• compiler/GHC/Tc/Errors/Types.hs
• compiler/GHC/Tc/Gen/Export.hs
• compiler/GHC/Tc/Types.hs
• compiler/GHC/Tc/Utils/Env.hs
• compiler/GHC/Tc/Utils/Monad.hs
• compiler/GHC/Tc/Utils/TcType.hs
• compiler/GHC/Tc/Zonk/Type.hs
• compiler/GHC/Types/Hint/Ppr.hs
• compiler/GHC/Types/Name/Reader.hs
• compiler/GHC/Unit/Finder.hs
• compiler/GHC/Unit/Finder/Types.hs
• compiler/GHC/Unit/State.hs
• compiler/GHC/Utils/Outputable.hs
• docs/users_guide/ghci.rst
• docs/users_guide/phases.rst
• ghc/GHCi/UI/Exception.hs
• ghc/Main.hs
• libraries/base/src/GHC/Base.hs
• libraries/base/src/GHC/Exts.hs
• libraries/ghc-experimental/src/GHC/PrimOps.hs
• libraries/ghc-internal/src/GHC/Internal/Types.hs
• libraries/xhtml
• testsuite/tests/annotations/should_fail/annfail03.stderr
• testsuite/tests/annotations/should_fail/annfail04.stderr
• testsuite/tests/annotations/should_fail/annfail06.stderr
• testsuite/tests/annotations/should_fail/annfail09.stderr
• testsuite/tests/ghci/prog-mhu002/prog-mhu002c.stdout
• testsuite/tests/ghci/scripts/ghci024.stdout
• testsuite/tests/ghci/scripts/ghci024.stdout-mingw32
• testsuite/tests/interface-stability/ghc-prim-exports.stdout
• testsuite/tests/interface-stability/ghc-prim-exports.stdout-mingw32
• + testsuite/tests/package/ImportReexport.hs
• + testsuite/tests/package/ImportReexport.stderr
• testsuite/tests/package/all.T
• testsuite/tests/perf/compiler/T11068.stdout
• testsuite/tests/pmcheck/should_compile/T12957.stderr
• testsuite/tests/profiling/should_run/staticcallstack002.stdout
• testsuite/tests/quasiquotation/qq001/qq001.stderr
• testsuite/tests/quasiquotation/qq002/qq002.stderr
• testsuite/tests/quasiquotation/qq003/qq003.stderr
• testsuite/tests/quasiquotation/qq004/qq004.stderr
• testsuite/tests/quotes/LiftErrMsg.stderr
• testsuite/tests/quotes/LiftErrMsgDefer.stderr
• testsuite/tests/quotes/LiftErrMsgTyped.stderr
• testsuite/tests/quotes/T10384.stderr
• testsuite/tests/quotes/T5721.stderr
• testsuite/tests/quotes/TH_localname.stderr
• testsuite/tests/simplCore/should_compile/Makefile
• testsuite/tests/simplCore/should_compile/T13156.stdout
• testsuite/tests/simplCore/should_compile/T26615.stderr
• testsuite/tests/splice-imports/SI03.stderr
• testsuite/tests/splice-imports/SI05.stderr
• testsuite/tests/splice-imports/SI08.stderr
• testsuite/tests/splice-imports/SI08_oneshot.stderr
• testsuite/tests/splice-imports/SI16.stderr
• testsuite/tests/splice-imports/SI18.stderr
• testsuite/tests/splice-imports/SI20.stderr
• testsuite/tests/splice-imports/SI25.stderr
• testsuite/tests/splice-imports/SI28.stderr
• testsuite/tests/splice-imports/SI29.stderr
• testsuite/tests/splice-imports/SI31.stderr
• testsuite/tests/splice-imports/SI36.stderr
• testsuite/tests/splice-imports/T26088.stderr
• testsuite/tests/splice-imports/T26090.stderr
• + testsuite/tests/splice-imports/T26616.hs
• + testsuite/tests/splice-imports/T26616.stderr
• testsuite/tests/splice-imports/all.T
• testsuite/tests/th/T16976z.stderr
• testsuite/tests/th/T17820a.stderr
• testsuite/tests/th/T17820b.stderr
• testsuite/tests/th/T17820c.stderr
• testsuite/tests/th/T17820d.stderr
• testsuite/tests/th/T17820e.stderr
• testsuite/tests/th/T21547.stderr
• testsuite/tests/th/T23829_hasty.stderr
• testsuite/tests/th/T23829_hasty_b.stderr
• testsuite/tests/th/T23829_tardy.ghc.stderr
• testsuite/tests/th/T26098_local.stderr
• testsuite/tests/th/T26098_quote.stderr
• testsuite/tests/th/T26098_splice.stderr
• testsuite/tests/th/T26099.stderr
• testsuite/tests/th/T26568.stderr
• testsuite/tests/th/T5795.stderr
• testsuite/tests/typecheck/should_fail/T13292.stderr
• + testsuite/tests/typecheck/should_fail/T27390-explicit-kinds.stderr
• + testsuite/tests/typecheck/should_fail/T27390.hs
• + testsuite/tests/typecheck/should_fail/T27390.stderr
• + testsuite/tests/typecheck/should_fail/T27390a.hs
• testsuite/tests/typecheck/should_fail/all.T
• utils/haddock/haddock-api/src/Haddock.hs
• utils/haddock/haddock-api/src/Haddock/Backends/Hoogle.hs
• utils/haddock/haddock-api/src/Haddock/Backends/LaTeX.hs
• utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs
• utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/DocMarkup.hs
• utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Meta.hs
• utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Names.hs
• utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Utils.hs
• utils/haddock/haddock-api/src/Haddock/Doc.hs
• utils/haddock/haddock-api/src/Haddock/GhcUtils.hs
• utils/haddock/haddock-api/src/Haddock/Interface/AttachInstances.hs
• utils/haddock/haddock-api/src/Haddock/Interface/Create.hs
• utils/haddock/haddock-api/src/Haddock/Interface/Json.hs
• utils/haddock/haddock-api/src/Haddock/Interface/LexParseRn.hs
• utils/haddock/haddock-api/src/Haddock/Interface/ParseModuleHeader.hs
• utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs
• utils/haddock/haddock-api/src/Haddock/InterfaceFile.hs
• utils/haddock/haddock-api/src/Haddock/Options.hs
• utils/haddock/haddock-api/src/Haddock/Parser.hs
• utils/haddock/haddock-api/src/Haddock/Types.hs
• utils/haddock/haddock-api/src/Haddock/Utils/Json.hs
• utils/haddock/haddock-api/src/Haddock/Utils/Json/Parser.hs
• utils/haddock/haddock-api/src/Haddock/Utils/Json/Types.hs
• utils/haddock/haddock-library/src/Documentation/Haddock/Doc.hs
• utils/haddock/haddock-library/src/Documentation/Haddock/Markup.hs
• utils/haddock/haddock-library/src/Documentation/Haddock/Parser.hs
• utils/haddock/haddock-library/src/Documentation/Haddock/Parser/Util.hs
• utils/haddock/haddock-library/src/Documentation/Haddock/Types.hs
• utils/haddock/haddock-library/test/Documentation/Haddock/ParserSpec.hs

The diff was not included because it is too large.