diff options
| author | Ryan Scott <ryan.gl.scott@gmail.com> | 2020-03-25 13:50:38 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-03-31 10:54:20 -0400 |
| commit | 57b888c0e90be7189285a6b078c30b26d0923809 (patch) | |
| tree | 2635fd3a7205c11b85392d3ef815e247ea7b17ec /libraries/ghci/GHCi | |
| parent | f024b6e385bd1448968b7bf20de05f655c815bae (diff) | |
| download | haskell-57b888c0e90be7189285a6b078c30b26d0923809.tar.gz | |
Require GHC 8.8 as the minimum compiler for bootstrapping
This allows us to remove several bits of CPP that are either always
true or no longer reachable. As an added bonus, we no longer need to
worry about importing `Control.Monad.Fail.fail` qualified to avoid
clashing with `Control.Monad.fail`, since the latter is now the same
as the former.
Diffstat (limited to 'libraries/ghci/GHCi')
| -rw-r--r-- | libraries/ghci/GHCi/TH.hs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libraries/ghci/GHCi/TH.hs b/libraries/ghci/GHCi/TH.hs index 927376b53d..5351b90ef1 100644 --- a/libraries/ghci/GHCi/TH.hs +++ b/libraries/ghci/GHCi/TH.hs @@ -97,7 +97,6 @@ import GHCi.RemoteTypes import GHC.Serialized import Control.Exception -import qualified Control.Monad.Fail as Fail import Control.Monad.IO.Class (MonadIO (..)) import Data.Binary import Data.Binary.Put @@ -144,11 +143,8 @@ instance Monad GHCiQ where do (m', s') <- runGHCiQ m s (a, s'') <- runGHCiQ (f m') s' return (a, s'') -#if !MIN_VERSION_base(4,13,0) - fail = Fail.fail -#endif -instance Fail.MonadFail GHCiQ where +instance MonadFail GHCiQ where fail err = GHCiQ $ \s -> throwIO (GHCiQException s err) getState :: GHCiQ QState |