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/annotations | |
| 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/annotations')
| -rw-r--r-- | testsuite/tests/annotations/should_run/annrun01.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/testsuite/tests/annotations/should_run/annrun01.hs b/testsuite/tests/annotations/should_run/annrun01.hs index 0dbd44dd92..9030a39c60 100644 --- a/testsuite/tests/annotations/should_run/annrun01.hs +++ b/testsuite/tests/annotations/should_run/annrun01.hs @@ -4,6 +4,7 @@ module Main where import GHC import MonadUtils ( liftIO ) +import Data.Maybe import DynFlags ( defaultFatalMessager, defaultFlushOut ) import Annotations ( AnnTarget(..), CoreAnnTarget ) import GHC.Serialized ( deserializeWithData ) @@ -34,7 +35,7 @@ main = defaultErrorHandler defaultFatalMessager defaultFlushOut liftIO $ putStrLn "Finding Module" mod <- findModule mod_nm Nothing liftIO $ putStrLn "Getting Module Info" - Just mod_info <- getModuleInfo mod + mod_info <- fromJust <$> getModuleInfo mod liftIO $ putStrLn "Showing Details For Module" showTargetAnns (ModuleTarget mod) |