mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'new-monad-control'

Browse source
This commit is contained in:
Joey Hess 2011-12-24 23:02:42 -04:00
commit 6d4382a89e
3 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Annex/Exception.hs
View file

@ -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