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

Commits:

• 44aa2845
  by Teo Camarasu at 2025-08-06T04:55:38-04:00

  CODEOWNERS: add CLC as codeowner of base
  
  We also remove hvr, since I think he is no longer active

• d8f43188
  by Andrew Lelechenko at 2025-08-06T04:55:38-04:00

  Bump submodule text to 2.1.3
  

• a16f63dd
  by Nikolaos Chatzikonstantinou at 2025-08-06T04:55:40-04:00

  docs: fix internal import in getopt examples
  
  This external-facing doc example shouldn't mention GHC internals when
  using 'fromMaybe'.
  

3 changed files:

• CODEOWNERS
• libraries/base/src/System/Console/GetOpt.hs
• libraries/text

Changes:

 /compiler/GHC/Runtime/Interpreter/Wasm.hs @TerrorJack

 [Core libraries]

-/libraries/base/                  @hvr

+/libraries/base/                  @core-libraries

 /libraries/ghci/                  @simonmar

 /libraries/template-haskell/      @rae

 /testsuite/tests/interface-stability/ @core-libraries

 >    module Opts1 where

 >

 >    import System.Console.GetOpt

->    import GHC.Internal.Data.Maybe ( fromMaybe )

+>    import Data.Maybe ( fromMaybe )

 >

 >    data Flag

 >     = Verbose  | Version

 >    module Opts2 where

 >

 >    import System.Console.GetOpt

->    import GHC.Internal.Data.Maybe ( fromMaybe )

+>    import Data.Maybe ( fromMaybe )

 >

 >    data Options = Options

 >     { optVerbose     :: Bool

-Subproject commit f1a05704a153ecc6a9bd45f6df8dd99820e74a2d

+Subproject commit 5f343f668f421bfb30cead594e52d0ac6206ff67