snap 1.1.2.0 → 1.1.3.0

raw patch · 3 files changed

+17/−14 lines, 3 filesdep ~basedep ~snap-core

Dependency ranges changed: base, snap-core

Files

• snap.cabal +10/−9
• src/Snap/Snaplet/Internal/RST.hs +6/−4
• src/Snap/Snaplet/Test.hs +1/−1

@@ -1,5 +1,5 @@ name:           snap-version:        1.1.2.0+version:        1.1.3.0 synopsis:       Top-level package for the Snap Web Framework description:     This is the top-level package for the official Snap Framework libraries.@@ -39,10 +39,11 @@   GHC == 7.6.3,   GHC == 7.8.4,   GHC == 7.10.3,-  GHC == 8.0.1,-  GHC == 8.2.1,-  GHC == 8.4.1,-  GHC == 8.6.1+  GHC == 8.0.2,+  GHC == 8.2.2,+  GHC == 8.4.4,+  GHC == 8.6.3,+  GHC == 8.8.1  extra-source-files:   .ghci@@ -113,7 +114,7 @@   build-depends:     aeson                     >= 0.6      && < 1.5,     attoparsec                >= 0.10     && < 0.14,-    base                      >= 4        && < 4.13,+    base                      >= 4        && < 4.14,     bytestring                >= 0.9.1    && < 0.11,     cereal                    >= 0.3      && < 0.6,     clientsession             >= 0.8      && < 0.10,@@ -127,9 +128,9 @@     -- hashable is broken from 1.2.0.0 through 1.2.0.5     -- snap does work with hashable 1.1.*, but some have complained that     -- the version disjunction causes problems with dependency resolution.-    hashable                  >= 1.2.0.6  && < 1.3,+    hashable                  >= 1.2.0.6  && < 1.4,     heist                     >= 1.1      && < 1.2,-    lens                      >= 3.7.6    && < 4.18,+    lens                      >= 3.7.6    && < 4.19,     lifted-base               >= 0.2      && < 0.3,     map-syntax                >= 0.2      && < 0.4,     monad-control             >= 0.3      && < 1.1,@@ -257,7 +258,7 @@     mtl,     mwc-random,     pwstore-fast,-    QuickCheck                 >= 2.4.2    && < 2.13,+    QuickCheck                 >= 2.4.2    && < 2.14,     smallcheck                 >= 1.1.1    && < 1.2,     snap-core,     snap-server,

@@ -8,9 +8,9 @@  import           Control.Applicative         (Alternative (..),                                               Applicative (..))-import           Control.Category            ((.))-import           Control.Monad               (MonadPlus (..), ap)+import           Control.Monad import           Control.Monad.Base          (MonadBase (..))+import qualified Control.Monad.Fail as Fail import           Control.Monad.Reader        (MonadReader (..)) import           Control.Monad.State.Class   (MonadState (..)) import           Control.Monad.Trans         (MonadIO (..), MonadTrans (..))@@ -18,8 +18,6 @@                                               MonadTransControl (..),                                               defaultLiftBaseWith,                                               defaultRestoreM)-import           Prelude                     (Functor (..), Monad (..), seq,-                                              ($)) import           Snap.Core                   (MonadSnap (..))  @@ -93,8 +91,12 @@ instance (Monad m) => Monad (RST r s m) where     return a = RST $ \_ s -> return (a, s)     (>>=)    = rwsBind+#if !MIN_VERSION_base(4,13,0)     fail msg = RST $ \_ _ -> fail msg+#endif +instance Fail.MonadFail m => Fail.MonadFail (RST r s m) where+    fail msg = RST $ \_ _ -> Fail.fail msg  instance (MonadPlus m) => MonadPlus (RST r s m) where     mzero       = RST $ \_ _ -> mzero

@@ -38,7 +38,7 @@   --------------------------------------------------------------------------------- | Remove the given file before running an IO computation. Obviously it+-- | Remove the given file after running an IO computation. Obviously it -- can be used with 'Assertion'. withTemporaryFile :: FilePath -> IO () -> IO () withTemporaryFile f = finally (removeFileMayNotExist f)