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-server".
The branch, master has been updated
via 180642bd0246cb33f86de6a54847f3576b09131e (commit)
from 54325c84e98fbf30ab20590384b84c9cd51f9093 (commit)
Summary of changes:
src/Snap/Internal/Http/Parser.hs | 3 ++-
src/Snap/Internal/Http/Server/LibevBackend.hs | 3 ++-
src/Snap/Internal/Http/Server/SimpleBackend.hs | 3 ++-
test/suite/Snap/Internal/Http/Server/Tests.hs | 3 ++-
4 files changed, 8 insertions(+), 4 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 180642bd0246cb33f86de6a54847f3576b09131e
Author: Aycan iRiCAN <[email protected]>
Date: Wed Jun 2 03:07:27 2010 +0300
Ambiguous module name `Control.Monad.Trans':
it was found in multiple packages: mtl-1.1.0.2 monads-fd-0.1.0.1
fixed by adding PackageImports pragma and monads-fd.
diff --git a/src/Snap/Internal/Http/Parser.hs b/src/Snap/Internal/Http/Parser.hs
index fee9af6..b0d9215 100644
--- a/src/Snap/Internal/Http/Parser.hs
+++ b/src/Snap/Internal/Http/Parser.hs
@@ -1,6 +1,7 @@
{-# LANGUAGE BangPatterns #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE PackageImports #-}
module Snap.Internal.Http.Parser
( IRequest(..)
@@ -18,7 +19,7 @@ module Snap.Internal.Http.Parser
import Control.Applicative
import Control.Arrow (second)
import Control.Monad (liftM)
-import Control.Monad.Trans
+import "monads-fd" Control.Monad.Trans
import Data.Attoparsec hiding (many, Result(..))
import Data.Attoparsec.Iteratee
import Data.Bits
diff --git a/src/Snap/Internal/Http/Server/LibevBackend.hs
b/src/Snap/Internal/Http/Server/LibevBackend.hs
index d53004f..8e8f648 100644
--- a/src/Snap/Internal/Http/Server/LibevBackend.hs
+++ b/src/Snap/Internal/Http/Server/LibevBackend.hs
@@ -4,6 +4,7 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE PackageImports #-}
module Snap.Internal.Http.Server.LibevBackend
( Backend
@@ -34,7 +35,7 @@ module Snap.Internal.Http.Server.LibevBackend
import Control.Concurrent
import Control.Exception
import Control.Monad
-import Control.Monad.Trans
+import "monads-fd" Control.Monad.Trans
import Data.ByteString (ByteString)
import Data.ByteString.Internal (c2w, w2c)
import qualified Data.ByteString.Unsafe as B
diff --git a/src/Snap/Internal/Http/Server/SimpleBackend.hs
b/src/Snap/Internal/Http/Server/SimpleBackend.hs
index d13b26f..e17fff4 100644
--- a/src/Snap/Internal/Http/Server/SimpleBackend.hs
+++ b/src/Snap/Internal/Http/Server/SimpleBackend.hs
@@ -4,6 +4,7 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE PackageImports #-}
module Snap.Internal.Http.Server.SimpleBackend
( Backend
@@ -29,7 +30,7 @@ module Snap.Internal.Http.Server.SimpleBackend
------------------------------------------------------------------------------
import Control.Concurrent
import Control.Exception
-import Control.Monad.Trans
+import "monads-fd" Control.Monad.Trans
import Data.ByteString (ByteString)
import Data.ByteString.Internal (c2w, w2c)
import qualified Data.ByteString as B
diff --git a/test/suite/Snap/Internal/Http/Server/Tests.hs
b/test/suite/Snap/Internal/Http/Server/Tests.hs
index 568b3c2..5e66ce3 100644
--- a/test/suite/Snap/Internal/Http/Server/Tests.hs
+++ b/test/suite/Snap/Internal/Http/Server/Tests.hs
@@ -1,5 +1,6 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE PackageImports #-}
module Snap.Internal.Http.Server.Tests
( tests ) where
@@ -7,7 +8,7 @@ module Snap.Internal.Http.Server.Tests
import Control.Concurrent
import Control.Exception (try, SomeException)
import Control.Monad
-import Control.Monad.Trans
+import "monads-fd" Control.Monad.Trans
import qualified Data.ByteString as S
import qualified Data.ByteString.Lazy as L
import qualified Data.ByteString.Lazy.Char8 as LC
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
