redis 0.13.0.1 → 0.14

raw patch · 3 files changed

+12/−7 lines, 3 filesdep +exceptionsdep −MonadCatchIO-mtl

Dependencies added: exceptions

Dependencies removed: MonadCatchIO-mtl

Files

• Database/Redis/Internal.hs +6/−2
• Database/Redis/Monad.hs +3/−3
• redis.cabal +3/−2

@@ -6,12 +6,16 @@ {-# LANGUAGE CPP, OverloadedStrings, BangPatterns #-} module Database.Redis.Internal where -import Prelude hiding (putStrLn, putStr, catch)+#if MIN_VERSION_utf8_string(1,0,0)+import Prelude hiding (catch)+#else+import Prelude hiding (catch, putStrLn, putStr)+import System.IO.UTF8 (putStrLn, putStr)+#endif import Control.Concurrent (ThreadId, myThreadId) import qualified Control.Concurrent.RLock as RLock import Data.IORef import qualified System.IO as IO-import System.IO.UTF8 (putStrLn, putStr) import qualified Data.ByteString as B import Data.ByteString (ByteString) import Data.ByteString.Char8 (readInt)

@@ -85,7 +85,7 @@ where  import "mtl" Control.Monad.Trans-import "MonadCatchIO-mtl" Control.Monad.CatchIO+import "exceptions" Control.Monad.Catch import Data.ByteString (ByteString)  import qualified Database.Redis.Redis as R@@ -140,7 +140,7 @@ discard :: WithRedis m => m (R.Reply ()) discard = getRedis >>= liftIO . R.discard -run_multi :: (MonadCatchIO m, WithRedis m, BS s) => m () -> m (R.Reply s)+run_multi :: (MonadCatch m, MonadMask m, WithRedis m, BS s) => m () -> m (R.Reply s) run_multi cs = do r <- getRedis                   bracket (liftIO $ Internal.takeState r)                           (\_ -> liftIO $ Internal.putStateUnmodified r)@@ -156,7 +156,7 @@ unwatch :: WithRedis m => m (R.Reply ()) unwatch = getRedis >>= liftIO . R.unwatch -run_cas :: (MonadCatchIO m, WithRedis m, BS s1) => [s1] -> m a -> m a+run_cas :: (MonadCatch m, MonadMask m, WithRedis m, BS s1) => [s1] -> m a -> m a run_cas keys cs = let keys' = map toBS keys                   in do r <- getRedis                         bracket (liftIO $ Internal.takeState r)

@@ -1,5 +1,5 @@ Name:                redis-Version:             0.13.0.1+Version:             0.14 License:             MIT Maintainer:          Ganesh Sittampalam <ganesh@earth.li> Author:              Alexander Bogdanov <andorn@gmail.com>@@ -40,6 +40,7 @@ Stability:           deprecated Build-Type:          Simple Cabal-Version: >= 1.6+Tested-with:    GHC==7.8.4, GHC==7.10.1 License-File: LICENSE Homepage: http://hub.darcs.net/ganesh/redis @@ -61,7 +62,7 @@  Library     Build-Depends:       base < 5, containers, bytestring, utf8-string,-                         network, mtl, old-time, MonadCatchIO-mtl,+                         network, mtl, old-time, exceptions,                          concurrent-extra     Exposed-modules:     Database.Redis.Redis                          Database.Redis.Monad