This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap-core".
The branch, master has been updated
via 77ed8e74bfe52ed98c516a5f1ff4676a6476913e (commit)
from b184a0ada08daa086b3845c99088259b9734e573 (commit)
Summary of changes:
snap-core.cabal | 2 +-
src/Snap/Iteratee.hs | 45 ++++++++++++++++++++-------------------
test/snap-core-testsuite.cabal | 2 +-
3 files changed, 25 insertions(+), 24 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 77ed8e74bfe52ed98c516a5f1ff4676a6476913e
Author: Gregory Collins <[email protected]>
Date: Tue Aug 24 19:03:06 2010 -0400
Bump attoparsec dependency, fix buggy enumLBS
diff --git a/snap-core.cabal b/snap-core.cabal
index 542a0e8..b7b0420 100644
--- a/snap-core.cabal
+++ b/snap-core.cabal
@@ -184,7 +184,7 @@ Executable snap
other-modules: Snap.StarterTH
build-depends:
- attoparsec >= 0.8.0.2 && < 0.9,
+ attoparsec >= 0.8.1 && < 0.9,
base >= 4 && < 5,
bytestring,
bytestring-nums,
diff --git a/src/Snap/Iteratee.hs b/src/Snap/Iteratee.hs
index a3b736d..ac15c39 100644
--- a/src/Snap/Iteratee.hs
+++ b/src/Snap/Iteratee.hs
@@ -1,6 +1,7 @@
{-# LANGUAGE BangPatterns #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE PackageImports #-}
{-# LANGUAGE TypeSynonymInstances #-}
-- | Snap Framework type aliases and utilities for iteratees. Note that as a
@@ -44,27 +45,27 @@ module Snap.Iteratee
) where
------------------------------------------------------------------------------
-import Control.Monad
-import Control.Monad.CatchIO
-import Data.ByteString (ByteString)
-import qualified Data.ByteString as S
-import qualified Data.ByteString.Unsafe as S
-import qualified Data.ByteString.Lazy as L
-import qualified Data.DList as D
-import Data.Int
-import Data.IORef
-import Data.Iteratee
-import Data.Iteratee.IO (enumHandle)
-import qualified Data.Iteratee.Base.StreamChunk as SC
-import Data.Iteratee.WrappedByteString
-import qualified Data.ListLike as LL
-import Data.Monoid (mappend)
-import Foreign
-import Foreign.C.Types
-import GHC.ForeignPtr
-import Prelude hiding (catch,drop)
-import System.IO
-import Control.Monad.Trans (liftIO)
+import Control.Monad
+import Control.Monad.CatchIO
+import Data.ByteString (ByteString)
+import qualified Data.ByteString as S
+import qualified Data.ByteString.Unsafe as S
+import qualified Data.ByteString.Lazy as L
+import qualified Data.DList as D
+import Data.Int
+import Data.IORef
+import Data.Iteratee
+import Data.Iteratee.IO (enumHandle)
+import qualified Data.Iteratee.Base.StreamChunk as SC
+import Data.Iteratee.WrappedByteString
+import qualified Data.ListLike as LL
+import Data.Monoid (mappend)
+import Foreign
+import Foreign.C.Types
+import GHC.ForeignPtr
+import Prelude hiding (catch,drop)
+import System.IO
+import "monads-fd" Control.Monad.Trans (liftIO)
#ifndef PORTABLE
import Control.Exception (SomeException)
@@ -311,7 +312,7 @@ enumBS bs = enumPure1Chunk $ WrapBS bs
enumLBS :: (Monad m) => L.ByteString -> Enumerator m a
enumLBS lbs = el chunks
where
- el [] i = liftM liftI $ runIter i (EOF Nothing)
+ el [] i = return i
el (x:xs) i = do
i' <- liftM liftI $ runIter i (Chunk $ WrapBS x)
el xs i'
diff --git a/test/snap-core-testsuite.cabal b/test/snap-core-testsuite.cabal
index 1e99c31..a566650 100644
--- a/test/snap-core-testsuite.cabal
+++ b/test/snap-core-testsuite.cabal
@@ -36,7 +36,7 @@ Executable testsuite
build-depends:
QuickCheck >= 2,
- attoparsec >= 0.8.0.2 && < 0.9,
+ attoparsec >= 0.8.1 && < 0.9,
base >= 4 && < 5,
bytestring,
bytestring-nums,
-----------------------------------------------------------------------
hooks/post-receive
--
snap-core
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
