diff options
| author | Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> | 2019-06-08 20:48:07 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-06-12 07:37:12 -0400 |
| commit | 1219f8e8a3d1b58263bea76822322b746a632778 (patch) | |
| tree | bd93bdf1e09cd26a7c6104ba37c6734a74e8a7bc /ghc | |
| parent | 217e6db4af6752b13c586d4e8925a4a9a2f47245 (diff) | |
| download | haskell-1219f8e8a3d1b58263bea76822322b746a632778.tar.gz | |
Use DeriveFunctor throughout the codebase (#15654)
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/GHCi/UI/Monad.hs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ghc/GHCi/UI/Monad.hs b/ghc/GHCi/UI/Monad.hs index 6ecb079ea0..4491d24a52 100644 --- a/ghc/GHCi/UI/Monad.hs +++ b/ghc/GHCi/UI/Monad.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE CPP, FlexibleInstances #-} +{-# LANGUAGE CPP, FlexibleInstances, DeriveFunctor #-} {-# OPTIONS_GHC -fno-cse -fno-warn-orphans #-} -- -fno-cse is needed for GLOBAL_VAR's to behave properly @@ -255,6 +255,7 @@ recordBreak brkLoc = do return (False, oldCounter) newtype GHCi a = GHCi { unGHCi :: IORef GHCiState -> Ghc a } + deriving (Functor) reflectGHCi :: (Session, IORef GHCiState) -> GHCi a -> IO a reflectGHCi (s, gs) m = unGhc (unGHCi m gs) s @@ -262,9 +263,6 @@ reflectGHCi (s, gs) m = unGhc (unGHCi m gs) s startGHCi :: GHCi a -> GHCiState -> Ghc a startGHCi g state = do ref <- liftIO $ newIORef state; unGHCi g ref -instance Functor GHCi where - fmap = liftM - instance Applicative GHCi where pure a = GHCi $ \_ -> pure a (<*>) = ap |