aboutsummaryrefslogtreecommitdiff
path: root/haddock-api/src
diff options
context:
space:
mode:
authorArtem Pelenitsyn <a.pelenitsyn@gmail.com>2020-04-26 04:14:29 +0200
committerMatthew Pickering <matthewtpickering@gmail.com>2020-05-03 08:14:10 +0100
commitc60995fe05d9cc267e892448604b8b96a705ccc7 (patch)
tree0ae3fad1eab36b8fa91423537d340598bd70f61a /haddock-api/src
parent66faa532d4e3d93e87c5b042bef82d631dc74eb5 (diff)
add dependency on exceptions because GHC.Exception was boiled down (ghc #18075)
Diffstat (limited to 'haddock-api/src')
-rw-r--r--haddock-api/src/Haddock/GhcUtils.hs5
-rw-r--r--haddock-api/src/Haddock/Utils.hs3
2 files changed, 2 insertions, 6 deletions
diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs
index f8f6f838..b60b13a4 100644
--- a/haddock-api/src/Haddock/GhcUtils.hs
+++ b/haddock-api/src/Haddock/GhcUtils.hs
@@ -445,11 +445,6 @@ modifySessionDynFlags f = do
return ()
--- | A variant of 'gbracket' where the return value from the first computation
--- is not required.
-gbracket_ :: ExceptionMonad m => m a -> m b -> m c -> m c
-gbracket_ before_ after thing = gbracket before_ (const after) (const thing)
-
-- Extract the minimal complete definition of a Name, if one exists
minimalDef :: GhcMonad m => Name -> m (Maybe ClassMinimalDef)
minimalDef n = do
diff --git a/haddock-api/src/Haddock/Utils.hs b/haddock-api/src/Haddock/Utils.hs
index 9bd0d656..010bd8bc 100644
--- a/haddock-api/src/Haddock/Utils.hs
+++ b/haddock-api/src/Haddock/Utils.hs
@@ -67,6 +67,7 @@ import GHC
import GHC.Types.Name
import Control.Monad ( liftM )
+import Control.Monad.Catch ( bracket_ )
import Data.Char ( isAlpha, isAlphaNum, isAscii, ord, chr )
import Numeric ( showIntAtBase )
import Data.Map ( Map )
@@ -404,7 +405,7 @@ writeUtf8File filepath contents = withFile filepath WriteMode $ \h -> do
hPutStr h contents
withTempDir :: (ExceptionMonad m) => FilePath -> m a -> m a
-withTempDir dir = gbracket_ (liftIO $ createDirectory dir)
+withTempDir dir = bracket_ (liftIO $ createDirectory dir)
(liftIO $ removeDirectoryRecursive dir)
-----------------------------------------------------------------------------