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

Commits:

6 changed files:

Changes:

  • CODEOWNERS
    ... ... @@ -59,7 +59,7 @@
    59 59
     /compiler/GHC/Runtime/Interpreter/Wasm.hs @TerrorJack
    
    60 60
     
    
    61 61
     [Core libraries]
    
    62
    -/libraries/base/                  @hvr
    
    62
    +/libraries/base/                  @core-libraries
    
    63 63
     /libraries/ghci/                  @simonmar
    
    64 64
     /libraries/template-haskell/      @rae
    
    65 65
     /testsuite/tests/interface-stability/ @core-libraries
    

  • README.md
    ... ... @@ -81,6 +81,10 @@ These steps give you the default build, which includes everything
    81 81
     optimised and built in various ways (eg. profiling libs are built).
    
    82 82
     It can take a long time.  To customise the build, see the file `HACKING.md`.
    
    83 83
     
    
    84
    +## Nix
    
    85
    +
    
    86
    +If you are looking to use nix to develop on GHC, [check out the wiki for instructions](https://gitlab.haskell.org/ghc/ghc/-/wikis/building/preparation).
    
    87
    +
    
    84 88
     Filing bugs and feature requests
    
    85 89
     ================================
    
    86 90
     
    

  • docs/users_guide/exts/linear_types.rst
    ... ... @@ -213,6 +213,8 @@ With ``-XStrict``::
    213 213
        -- inferred unrestricted
    
    214 214
        let ~(x, y) = u in …
    
    215 215
     
    
    216
    +(See :ref:`strict-bindings`).
    
    217
    +
    
    216 218
     Data types
    
    217 219
     ----------
    
    218 220
     By default, all fields in algebraic data types are linear (even if
    

  • docs/users_guide/exts/strict.rst
    ... ... @@ -103,6 +103,9 @@ Note the following points:
    103 103
       See `GHC Proposal #229 <https://github.com/ghc-proposals/ghc-proposals/blob/master/proposals/0229-whitespace-bang-patterns.rst>`__
    
    104 104
       for the precise rules.
    
    105 105
     
    
    106
    +
    
    107
    +.. _strict-bindings:
    
    108
    +
    
    106 109
     Strict bindings
    
    107 110
     ~~~~~~~~~~~~~~~
    
    108 111
     
    

  • libraries/base/src/System/Console/GetOpt.hs
    ... ... @@ -315,7 +315,7 @@ arguments:
    315 315
     >    module Opts1 where
    
    316 316
     >
    
    317 317
     >    import System.Console.GetOpt
    
    318
    ->    import GHC.Internal.Data.Maybe ( fromMaybe )
    
    318
    +>    import Data.Maybe ( fromMaybe )
    
    319 319
     >
    
    320 320
     >    data Flag
    
    321 321
     >     = Verbose  | Version
    
    ... ... @@ -356,7 +356,7 @@ A different approach is to group the option values in a record of type
    356 356
     >    module Opts2 where
    
    357 357
     >
    
    358 358
     >    import System.Console.GetOpt
    
    359
    ->    import GHC.Internal.Data.Maybe ( fromMaybe )
    
    359
    +>    import Data.Maybe ( fromMaybe )
    
    360 360
     >
    
    361 361
     >    data Options = Options
    
    362 362
     >     { optVerbose     :: Bool
    

  • libraries/text
    1
    -Subproject commit f1a05704a153ecc6a9bd45f6df8dd99820e74a2d
    1
    +Subproject commit 5f343f668f421bfb30cead594e52d0ac6206ff67