Use exceptions in place of deprecated MonadCatchIO-transformers

Annex.hs

@@ -33,7 +33,7 @@ module Annex (
 ) where
 
 import "mtl" Control.Monad.Reader
-import "MonadCatchIO-transformers" Control.Monad.CatchIO
+import Control.Monad.Catch
 import Control.Concurrent
 
 import Common
@@ -77,7 +77,9 @@ newtype Annex a = Annex { runAnnex :: ReaderT (MVar AnnexState) IO a }
 		Monad,
 		MonadIO,
 		MonadReader (MVar AnnexState),
-		MonadCatchIO,
+		MonadCatch,
+		MonadThrow,
+		MonadMask,
 		Functor,
 		Applicative
 	)

Annex/Exception.hs

@@ -21,7 +21,7 @@ module Annex.Exception (
 	catchAnnex,
 ) where
 
-import qualified "MonadCatchIO-transformers" Control.Monad.CatchIO as M
+import qualified Control.Monad.Catch as M
 import Control.Exception
 
 import Common.Annex
@@ -43,7 +43,7 @@ tryAnnexIO = M.try
 
 {- throw in the Annex monad -}
 throwAnnex :: Exception e => e -> Annex a
-throwAnnex = M.throw
+throwAnnex = M.throwM
 
 {- catch in the Annex monad -}
 catchAnnex :: Exception e => Annex a -> (e -> Annex a) -> Annex a

git-annex.cabal

@@ -98,7 +98,7 @@ Executable git-annex
    containers, utf8-string, network (>= 2.0), mtl (>= 2),
    bytestring, old-locale, time, HTTP,
    extensible-exceptions, dataenc, SHA, process, json,
-   base (>= 4.5 && < 4.9), monad-control, MonadCatchIO-transformers,
+   base (>= 4.5 && < 4.9), monad-control, exceptions,
    IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process,
    SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3),
    data-default, case-insensitive