exception-transformers 0.4.0.4 → 0.4.0.5

raw patch · 2 files changed

+8/−35 lines, 2 filesdep ~HUnitdep ~exception-transformersPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: HUnit, exception-transformers

API changes (from Hackage documentation)

Files

• Control/Monad/Exception.hs +5/−32
• exception-transformers.cabal +3/−3

@@ -8,7 +8,7 @@ -- | -- Module      :  Control.Monad.Exception -- Copyright   :  (c) Harvard University 2008-2011---                (c) Geoffrey Mainland 2011-2014+--                (c) Geoffrey Mainland 2011-2016 -- License     :  BSD-style -- Maintainer  :  mainland@cs.drexel.edu @@ -28,9 +28,9 @@     liftException   ) where -#if defined(__GLASGOW_HASKELL__) && (__GLASGOW_HASKELL__ < 706)+#if !MIN_VERSION_base(4,6,0) import Prelude hiding (catch)-#endif+#endif /*!MIN_VERSION_base(4,6,0) */  import Control.Applicative import qualified Control.Exception as E (Exception(..),@@ -38,13 +38,7 @@                                          catch,                                          throw,                                          finally)-#if __GLASGOW_HASKELL__ >= 700 import qualified Control.Exception as E (mask)-#else /* __GLASGOW_HASKELL__ < 700 */-import qualified Control.Exception as E (block,-                                         blocked,-                                         unblock)-#endif /* __GLASGOW_HASKELL__ < 700 */ import Control.Monad (MonadPlus(..)) import Control.Monad.Fix (MonadFix(..)) import Control.Monad.IO.Class (MonadIO(..))@@ -85,18 +79,12 @@ import Control.Monad.Trans.Writer.Strict as Strict (WriterT(..),                                                     mapWriterT,                                                     runWriterT)+#if !MIN_VERSION_base(4,8,0) import Data.Monoid (Monoid)-#if __GLASGOW_HASKELL__ >= 700+#endif /* !MIN_VERSION_base(4,8,0) */ import GHC.Conc.Sync (STM(..),                       catchSTM,                       throwSTM)-#else /* __GLASGOW_HASKELL__ < 700 */-import GHC.Base (RealWorld,-                 State#,-                 catchSTM#,-                 raiseIO#)-import GHC.Conc (STM(..))-#endif /* __GLASGOW_HASKELL__ < 700 */  class (Monad m) => MonadException m where     -- | Throw an exception.@@ -273,21 +261,6 @@ instance MonadException STM where     catch = catchSTM     throw = throwSTM--#if __GLASGOW_HASKELL__ < 700-unSTM :: STM a -> (State# RealWorld -> (# State# RealWorld, a #))-unSTM (STM a) = a--catchSTM :: E.Exception e => STM a -> (e -> STM a) -> STM a-catchSTM (STM m) handler = STM $ catchSTM# m handler'-  where-    handler' e = case E.fromException e of-                   Just e' -> unSTM (handler e')-                   Nothing -> raiseIO# e--throwSTM :: E.Exception e => e -> STM a-throwSTM e = STM $ raiseIO# (E.toException e)-#endif /* __GLASGOW_HASKELL__ < 700 */  -- -- MonadException instances for transformers.

@@ -1,5 +1,5 @@ name:           exception-transformers-version:        0.4.0.4+version:        0.4.0.5 cabal-version:  >= 1.10 license:        BSD3 license-file:   LICENSE@@ -41,9 +41,9 @@   default-language: Haskell98    build-depends:-    HUnit                  >= 1.2 && < 1.4,+    HUnit                  >= 1.2 && < 1.6,     base                   >= 4   && < 5,-    exception-transformers >= 0.3 && < 0.5,+    exception-transformers,     test-framework         >= 0.8 && < 0.9,     test-framework-hunit   >= 0.3 && < 0.4,     transformers           >= 0.2 && < 0.6,