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, 0.3-stable has been updated
via 4672af409110a63bb1847391eaa71e2d40a1c528 (commit)
via 1d6627a4c5dc4581713869e57c290456a005a17e (commit)
from 8365c6bdd27dfaca0f979c0266ff82d57c5b7990 (commit)
Summary of changes:
snap-core.cabal | 4 ++--
src/Snap/Iteratee.hs | 21 ++++++---------------
2 files changed, 8 insertions(+), 17 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 4672af409110a63bb1847391eaa71e2d40a1c528
Author: Gregory Collins <[email protected]>
Date: Sat Jan 15 13:32:48 2011 +0100
Bump version
diff --git a/snap-core.cabal b/snap-core.cabal
index f57b36f..59672c1 100644
--- a/snap-core.cabal
+++ b/snap-core.cabal
@@ -1,5 +1,5 @@
name: snap-core
-version: 0.3.1
+version: 0.3.2
synopsis: Snap: A Haskell Web Framework (Core)
description:
commit 1d6627a4c5dc4581713869e57c290456a005a17e
Author: Gregory Collins <[email protected]>
Date: Sat Jan 15 13:31:56 2011 +0100
Fix build issues w.r.t. enumerator 0.4.5
diff --git a/snap-core.cabal b/snap-core.cabal
index f526023..f57b36f 100644
--- a/snap-core.cabal
+++ b/snap-core.cabal
@@ -149,7 +149,7 @@ Library
deepseq >= 1.1 && <1.2,
directory,
dlist >= 0.5 && < 0.6,
- enumerator > 0.4.2 && < 0.5,
+ enumerator >= 0.4.5 && < 0.5,
filepath,
MonadCatchIO-transformers >= 0.2.1 && < 0.3,
mtl == 2.0.*,
diff --git a/src/Snap/Iteratee.hs b/src/Snap/Iteratee.hs
index a110b33..d97ebe8 100644
--- a/src/Snap/Iteratee.hs
+++ b/src/Snap/Iteratee.hs
@@ -93,18 +93,8 @@ module Snap.Iteratee
------------------------------------------------------------------------------
-{-
-
-import Control.Exception (SomeException)
-import "MonadCatchIO-transformers" Control.Monad.CatchIO
-import qualified Data.DList as D
-import Data.IORef
-import Prelude hiding (catch,drop)
-
--}
-
import Control.DeepSeq
-import Control.Exception (SomeException, assert)
+import Control.Exception (assert)
import Control.Monad
import "MonadCatchIO-transformers" Control.Monad.CatchIO
import Control.Monad.Trans (MonadIO, lift, liftIO)
@@ -112,9 +102,10 @@ import Data.ByteString (ByteString)
import qualified Data.ByteString.Char8 as S
import qualified Data.ByteString.Unsafe as S
import qualified Data.ByteString.Lazy.Char8 as L
-import Data.Enumerator hiding (drop)
-import Data.Enumerator.IO (enumHandle)
-import Data.List (foldl')
+import Data.Enumerator hiding (consume, drop, head)
+import Data.Enumerator.List hiding (take, drop)
+import Data.Enumerator.Binary (enumHandle)
+import qualified Data.List as List
import Data.Monoid (mappend)
import Data.Typeable
import Foreign hiding (peek)
@@ -149,7 +140,7 @@ instance (Functor m, MonadCatchIO m) =>
------------------------------------------------------------------------------
-- | Get the length of a bytestring Stream
streamLength :: Stream ByteString -> Int
-streamLength (Chunks xs) = foldl' (\c s -> c + S.length s) 0 xs
+streamLength (Chunks xs) = List.foldl' (\c s -> c + S.length s) 0 xs
streamLength EOF = 0
-----------------------------------------------------------------------
hooks/post-receive
--
snap-core
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
