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 467cd7876dac3455b48362dd93c72b0969418f5a (commit)
via 26b716d7113f7866a0be8d6a567a84305801925c (commit)
via 3a0a89e922619eacc05290697f437db2af8b7b99 (commit)
via 4672af409110a63bb1847391eaa71e2d40a1c528 (commit)
via 1d6627a4c5dc4581713869e57c290456a005a17e (commit)
from 6d517d7f89d7a9791f3d0e5ac81703b9fe5be5a8 (commit)
Summary of changes:
snap-core.cabal | 2 +-
src/Snap/Iteratee.hs | 19 +++++--------------
2 files changed, 6 insertions(+), 15 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 467cd7876dac3455b48362dd93c72b0969418f5a
Merge: 3a0a89e 26b716d
Author: Gregory Collins <[email protected]>
Date: Sat Jan 15 13:41:43 2011 +0100
Merge branch '0.3-stable'
diff --cc src/Snap/Iteratee.hs
index a2352cf,2181cae..518da6c
--- a/src/Snap/Iteratee.hs
+++ b/src/Snap/Iteratee.hs
@@@ -96,9 -93,8 +96,9 @@@ module Snap.Iterate
------------------------------------------------------------------------------
+import Blaze.ByteString.Builder
import Control.DeepSeq
- import Control.Exception (assert)
+ import Control.Exception (SomeException, assert)
import Control.Monad
import "MonadCatchIO-transformers" Control.Monad.CatchIO
import Control.Monad.Trans (MonadIO, lift, liftIO)
commit 26b716d7113f7866a0be8d6a567a84305801925c
Author: Gregory Collins <[email protected]>
Date: Sat Jan 15 13:40:13 2011 +0100
oops, build fix
diff --git a/snap-core.cabal b/snap-core.cabal
index 59672c1..7b5fcfe 100644
--- a/snap-core.cabal
+++ b/snap-core.cabal
@@ -1,5 +1,5 @@
name: snap-core
-version: 0.3.2
+version: 0.3.1.1
synopsis: Snap: A Haskell Web Framework (Core)
description:
diff --git a/src/Snap/Iteratee.hs b/src/Snap/Iteratee.hs
index d97ebe8..2181cae 100644
--- a/src/Snap/Iteratee.hs
+++ b/src/Snap/Iteratee.hs
@@ -94,7 +94,7 @@ module Snap.Iteratee
------------------------------------------------------------------------------
import Control.DeepSeq
-import Control.Exception (assert)
+import Control.Exception (SomeException, assert)
import Control.Monad
import "MonadCatchIO-transformers" Control.Monad.CatchIO
import Control.Monad.Trans (MonadIO, lift, liftIO)
commit 3a0a89e922619eacc05290697f437db2af8b7b99
Merge: 6d517d7 4672af4
Author: Gregory Collins <[email protected]>
Date: Sat Jan 15 13:39:08 2011 +0100
Merge branch '0.3-stable'
diff --cc src/Snap/Iteratee.hs
index 97d2bc7,d97ebe8..a2352cf
--- a/src/Snap/Iteratee.hs
+++ b/src/Snap/Iteratee.hs
@@@ -96,19 -93,8 +96,9 @@@ module Snap.Iterate
------------------------------------------------------------------------------
- {-
-
- 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 Blaze.ByteString.Builder
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)
@@@ -116,10 -102,10 +106,11 @@@ import Data.ByteString (Byt
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 hiding (consume, drop, head)
-import Data.Enumerator.List hiding (take, drop)
+import qualified Data.Enumerator as I
- import Data.Enumerator.IO (enumHandle)
- import Data.List (foldl')
+ import Data.Enumerator.Binary (enumHandle)
++import Data.Enumerator.List hiding (take, drop)
+ import qualified Data.List as List
import Data.Monoid (mappend)
import Data.Typeable
import Foreign hiding (peek)
-----------------------------------------------------------------------
hooks/post-receive
--
snap-core
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
