summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-24 23:02:42 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-24 23:02:42 -0400
commit6d4382a89ee0a021b3fa71302bfd74a906029e63 (patch)
tree99885f1cf6862aff0ffa37ba1f4b018ba92effa1 /Annex
parentffefe742d8cc2655e29fa356c82326e867e27aa9 (diff)
parente04852c8af22f784d184a001b9fee04adb1828c1 (diff)
Merge branch 'new-monad-control'
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Exception.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Annex/Exception.hs b/Annex/Exception.hs
index c147439a1..cb36d1bdb 100644
--- a/Annex/Exception.hs
+++ b/Annex/Exception.hs
@@ -11,8 +11,8 @@ module Annex.Exception (
throw,
) where
-import Control.Exception.Control (handle)
-import Control.Monad.IO.Control (liftIOOp)
+import Control.Exception.Lifted (handle)
+import Control.Monad.Trans.Control (liftBaseOp)
import Control.Exception hiding (handle, throw)
import Common.Annex
@@ -20,7 +20,7 @@ import Common.Annex
{- Runs an Annex action, with setup and cleanup both in the IO monad. -}
bracketIO :: IO c -> (c -> IO b) -> Annex a -> Annex a
bracketIO setup cleanup go =
- liftIOOp (Control.Exception.bracket setup cleanup) (const go)
+ liftBaseOp (Control.Exception.bracket setup cleanup) (const go)
{- Throws an exception in the Annex monad. -}
throw :: Control.Exception.Exception e => e -> Annex a