Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC
Commits:
-
b5883cee
by Lauren Yim at 2025-06-17T16:46:12-04:00
-
4b0c0cd1
by Rodrigo Mesquita at 2025-06-17T16:46:13-04:00
2 changed files:
Changes:
| ... | ... | @@ -177,7 +177,7 @@ showGhcException ctx = showPlainGhcException . \case |
| 177 | 177 | PprProgramError str sdoc -> PlainProgramError $
|
| 178 | 178 | concat [str, "\n\n", renderWithContext ctx sdoc]
|
| 179 | 179 | |
| 180 | -throwGhcException :: GhcException -> a
|
|
| 180 | +throwGhcException :: HasCallStack => GhcException -> a
|
|
| 181 | 181 | throwGhcException = Exception.throw
|
| 182 | 182 | |
| 183 | 183 | throwGhcExceptionIO :: GhcException -> IO a
|
| ... | ... | @@ -192,7 +192,7 @@ pprPanic s doc = withFrozenCallStack $ panicDoc s (doc $$ callStackDoc) |
| 192 | 192 | |
| 193 | 193 | -- | Throw an exception saying "bug in GHC"
|
| 194 | 194 | panicDoc :: HasCallStack => String -> SDoc -> a
|
| 195 | -panicDoc x doc = throwGhcException (PprPanic x doc)
|
|
| 195 | +panicDoc x doc = withFrozenCallStack $ throwGhcException (PprPanic x doc)
|
|
| 196 | 196 | |
| 197 | 197 | -- | Throw an exception saying "this isn't finished yet"
|
| 198 | 198 | sorryDoc :: String -> SDoc -> a
|
| ... | ... | @@ -2536,7 +2536,7 @@ of ``-W(no-)*``. |
| 2536 | 2536 | |
| 2537 | 2537 | :since: 9.8.1
|
| 2538 | 2538 | |
| 2539 | - Ino accordance with `GHC Proposal #134
|
|
| 2539 | + In accordance with `GHC Proposal #134
|
|
| 2540 | 2540 | <https://github.com/ghc-proposals/ghc-proposals/blob/master/proposals/0134-deprecating-exports-proposal.rst>`__,
|
| 2541 | 2541 | it is now possible to deprecate certain exports of a name without deprecating the name itself.
|
| 2542 | 2542 | |
| ... | ... | @@ -2556,8 +2556,8 @@ of ``-W(no-)*``. |
| 2556 | 2556 | )
|
| 2557 | 2557 | import A
|
| 2558 | 2558 | |
| 2559 | - When :ghc-flag:`-Wincomplete-export-warnings` is enabled, GHC warns about exports
|
|
| 2560 | - that are not deprecating a name that is deprecated with another export in that module.
|
|
| 2559 | + When :ghc-flag:`-Wincomplete-export-warnings` is enabled, GHC warns about exports
|
|
| 2560 | + that are not deprecating a name that is deprecated with another export in that module.
|
|
| 2561 | 2561 | |
| 2562 | 2562 | .. ghc-flag:: -Wbadly-levelled-types
|
| 2563 | 2563 | :shortdesc: warn when type binding is used at the wrong Template Haskell level.
|
| ... | ... | @@ -2630,7 +2630,7 @@ of ``-W(no-)*``. |
| 2630 | 2630 | :since: 9.10.1
|
| 2631 | 2631 | |
| 2632 | 2632 | Introduced in GHC 9.10.1 with the introduction of an implicit
|
| 2633 | - :base-ref:`Control.Exception.Context.ExceptionContext`` context to
|
|
| 2633 | + :base-ref:`Control.Exception.Context.ExceptionContext` context to
|
|
| 2634 | 2634 | :base-ref:`Control.Exception.SomeException`. To preserve compatibility
|
| 2635 | 2635 | with earlier compilers, this constraints is implicitly defaulted to
|
| 2636 | 2636 | :base-ref:`Control.Exception.Context.emptyExceptionContext` when no other
|