Permalink
Browse files

Switch back to MonadCatchIO

  • Loading branch information...
1 parent ea0be27 commit b832948bdcd946ad2e26257e38bdf45c7db55998 @norm2782 committed Oct 17, 2011
Showing with 6 additions and 6 deletions.
  1. +2 −2 snaplet-hdbc.cabal
  2. +4 −4 src/Snap/Snaplet/Hdbc.hs
View
@@ -30,8 +30,8 @@ Library
data-lens-template >= 2.1 && < 2.2,
HDBC >= 2.2,
mtl > 2.0 && < 2.1,
- monad-control >= 0.2,
- resource-pool >= 0.2,
+ MonadCatchIO-transformers >= 0.2,
+ resource-pool-catchio >= 0.2,
snap >= 0.6 && < 0.7,
text >= 0.11,
time >= 1.2,
@@ -74,8 +74,8 @@ module Snap.Snaplet.Hdbc (
import Prelude hiding (catch)
-import Control.Exception.Control hiding (Handler)
-import Control.Monad.IO.Control
+import Control.Exception (SomeException)
+import Control.Monad.CatchIO
import Control.Monad.State
import Data.Map (Map)
import Data.Pool
@@ -86,7 +86,7 @@ import Snap.Snaplet
type Row = Map String SqlValue
-class (IConnection c, MonadControlIO m) => HasHdbc m c | m -> c where
+class (IConnection c, MonadCatchIO m) => HasHdbc m c | m -> c where
getPool :: m (Pool c)
data HdbcSnaplet c = IConnection c => HdbcSnaplet {
@@ -145,7 +145,7 @@ withTransaction' action = do
commit
return r
where doRollback = catch rollback doRollbackHandler
- doRollbackHandler :: MonadControlIO m => SomeException -> m ()
+ doRollbackHandler :: MonadCatchIO m => SomeException -> m ()
doRollbackHandler _ = return ()
disconnect :: HasHdbc m c => m ()

0 comments on commit b832948

Please sign in to comment.