Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

• 202ed264
  by Marc Scholten at 2026-06-25T05:52:21-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>
  

31 changed files:

• compiler/GHC/Hs/DocString.hs
• libraries/xhtml
• 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.