From f5d051dcef098ff3ae1c0f82e9d5c2805e6a1895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Fri, 15 Aug 2014 20:35:21 +0200 Subject: [PATCH] Remove `toGhcModT` it's not needed anymore. --- Language/Haskell/GhcMod/Internal.hs | 2 -- Language/Haskell/GhcMod/Logger.hs | 4 ++-- Language/Haskell/GhcMod/Monad.hs | 8 -------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Language/Haskell/GhcMod/Internal.hs b/Language/Haskell/GhcMod/Internal.hs index d55bfc9..9c9ef10 100644 --- a/Language/Haskell/GhcMod/Internal.hs +++ b/Language/Haskell/GhcMod/Internal.hs @@ -36,8 +36,6 @@ module Language.Haskell.GhcMod.Internal ( -- * Monad utilities , runGhcModT' , withErrorHandler - -- ** Conversion - , toGhcModT -- ** Accessing 'GhcModEnv' and 'GhcModState' , options , cradle diff --git a/Language/Haskell/GhcMod/Logger.hs b/Language/Haskell/GhcMod/Logger.hs index beccd1b..5e1d8df 100644 --- a/Language/Haskell/GhcMod/Logger.hs +++ b/Language/Haskell/GhcMod/Logger.hs @@ -125,7 +125,7 @@ withLoggerTwice setDF1 body1 setDF2 body2 = do Right <$> readAndClearLogBagRef logref -- Merge errors and warnings dflags <- G.getSessionDynFlags - style <- toGhcModT getStyle + style <- getStyle case (err1, err2) of (Right b1, Right b2) -> do let (warn1,warn2) = mergeErrors dflags style b1 b2 errAndWarnBagToStr Right emptyBag (warn1 `unionBags` b2) @@ -150,7 +150,7 @@ errBagToStr = errBagToStr' Left errBagToStr' :: IOish m => (String -> a) -> Bag ErrMsg -> GhcModT m a errBagToStr' f err = do dflags <- G.getSessionDynFlags - style <- toGhcModT getStyle + style <- getStyle ret <- convert' (errBagToStrList dflags style err) return $ f ret diff --git a/Language/Haskell/GhcMod/Monad.hs b/Language/Haskell/GhcMod/Monad.hs index 05a24fa..e762322 100644 --- a/Language/Haskell/GhcMod/Monad.hs +++ b/Language/Haskell/GhcMod/Monad.hs @@ -19,8 +19,6 @@ module Language.Haskell.GhcMod.Monad ( , runGhcModT , runGhcModT' , withErrorHandler - -- ** Conversion - , toGhcModT -- ** Accessing 'GhcModEnv' and 'GhcModState' , gmsGet , gmsPut @@ -306,12 +304,6 @@ overrideGhcUserOptions action = withTempSession $ do action ghcOpts --- | This is only a transitional mechanism don't use it for new code. -toGhcModT :: IOish m => Ghc a -> GhcModT m a -toGhcModT a = do - s <- gmGhcSession <$> ask - liftIO $ unGhc a $ Session s - ---------------------------------------------------------------- gmsGet :: IOish m => GhcModT m GhcModState