diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2018-08-06 12:53:06 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-08-07 15:56:53 -0400 |
| commit | aab8656ba0561e56048a1222c396d2d117aca5a7 (patch) | |
| tree | 8d14345e7f042ba5700b4275950e44dcc0ca1be9 /testsuite/tests/monadfail | |
| parent | f22baa424aed66cd75ea05d4db7efdcd0e021217 (diff) | |
| download | haskell-aab8656ba0561e56048a1222c396d2d117aca5a7.tar.gz | |
Turn on MonadFail desugaring by default
Summary:
This contains two commits:
----
Make GHC's code-base compatible w/ `MonadFail`
There were a couple of use-sites which implicitly used pattern-matches
in `do`-notation even though the underlying `Monad` didn't explicitly
support `fail`
This refactoring turns those use-sites into explicit case
discrimations and adds an `MonadFail` instance for `UniqSM`
(`UniqSM` was the worst offender so this has been postponed for a
follow-up refactoring)
---
Turn on MonadFail desugaring by default
This finally implements the phase scheduled for GHC 8.6 according to
https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail#Transitionalstrategy
This also preserves some tests that assumed MonadFail desugaring to be
active; all ghc boot libs were already made compatible with this
`MonadFail` long ago, so no changes were needed there.
Test Plan: Locally performed ./validate --fast
Reviewers: bgamari, simonmar, jrtc27, RyanGlScott
Reviewed By: bgamari
Subscribers: bgamari, RyanGlScott, rwbarton, thomie, carter
Differential Revision: https://phabricator.haskell.org/D5028
Diffstat (limited to 'testsuite/tests/monadfail')
| -rw-r--r-- | testsuite/tests/monadfail/MonadFailWarnings.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/monadfail/MonadFailWarningsDisabled.hs | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/testsuite/tests/monadfail/MonadFailWarnings.hs b/testsuite/tests/monadfail/MonadFailWarnings.hs index a1d3729222..f540201c53 100644 --- a/testsuite/tests/monadfail/MonadFailWarnings.hs +++ b/testsuite/tests/monadfail/MonadFailWarnings.hs @@ -1,7 +1,7 @@ -- Test purpose: -- Ensure that MonadFail warnings are issued correctly if the warning flag -- is enabled - +{-# LANGUAGE NoMonadFailDesugaring #-} {-# OPTIONS_GHC -Wmissing-monadfail-instances #-} module MonadFailWarnings where diff --git a/testsuite/tests/monadfail/MonadFailWarningsDisabled.hs b/testsuite/tests/monadfail/MonadFailWarningsDisabled.hs index d3df107a4a..c6fd34a67e 100644 --- a/testsuite/tests/monadfail/MonadFailWarningsDisabled.hs +++ b/testsuite/tests/monadfail/MonadFailWarningsDisabled.hs @@ -2,6 +2,11 @@ -- Make sure that not enabling MonadFail warnings makes code compile just -- as it did in < 8.0 +-- NOTE: starting w/ GHC 8.6 sugaring is turned on by default; so we have +-- to disable to keep supporting this test-case +-- +{-# LANGUAGE NoMonadFailDesugaring #-} + module MonadFailWarnings where import Control.Monad.Fail |