Merge branch 'enumerator' of git.snapframework.com:snap-server into e…

…numerator
ozataman · Dec 4, 2010 · d7e7d6d · d7e7d6d
2 parents 01fa6a7 + ffb7f66
commit d7e7d6d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/snap-server.cabal b/snap-server.cabal
@@ -131,7 +131,7 @@ Library
     enumerator == 0.4.*,
     filepath,
     MonadCatchIO-transformers >= 0.2.1 && < 0.3,
-    monads-fd >= 0.1.0.4 && <0.2,
+    mtl == 2.0.*,
     murmur-hash >= 0.1 && < 0.2,
     network == 2.2.1.*,
     old-locale,

diff --git a/src/Snap/Internal/Http/Parser.hs b/src/Snap/Internal/Http/Parser.hs
@@ -20,7 +20,7 @@ module Snap.Internal.Http.Parser
 import             Control.Applicative
 import             Control.Arrow (second)
 import             Control.Monad (liftM)
-import "monads-fd" Control.Monad.Trans
+import             Control.Monad.Trans
 import             Data.Attoparsec hiding (many, Result(..))
 import             Data.Attoparsec.Enumerator
 import             Data.Bits

diff --git a/src/Snap/Internal/Http/Server/LibevBackend.hs b/src/Snap/Internal/Http/Server/LibevBackend.hs
@@ -34,7 +34,7 @@ libEvEventLoop _ _ _ _ = throwIO $ LibevException "libev event loop is not suppo
 import             Control.Concurrent hiding (yield)
 import             Control.Exception
 import             Control.Monad
-import "monads-fd" Control.Monad.Trans
+import             Control.Monad.Trans
 import             Data.ByteString (ByteString)
 import             Data.ByteString.Internal (c2w)
 import qualified   Data.ByteString as S

diff --git a/src/Snap/Internal/Http/Server/SimpleBackend.hs b/src/Snap/Internal/Http/Server/SimpleBackend.hs
@@ -12,7 +12,7 @@ module Snap.Internal.Http.Server.SimpleBackend
   ) where
 
 ------------------------------------------------------------------------------
-import "monads-fd" Control.Monad.Trans
+import           Control.Monad.Trans
 
 import           Control.Concurrent hiding (yield)
 import           Control.Exception