Got rid of monads-fd.

snapframework · Nov 28, 2010 · bec80fc · bec80fc
1 parent 49c38cf
commit bec80fc
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 18 deletions.
diff --git a/snap-core.cabal b/snap-core.cabal
@@ -150,15 +150,14 @@ Library
     directory,
     dlist >= 0.5 && < 0.6,
     enumerator == 0.4.*,
-    enumerator-fd == 0.1.*,
     filepath,
     MonadCatchIO-transformers >= 0.2.1 && < 0.3,
-    monads-fd < 0.2,
+    mtl == 2.0.*,
     old-locale,
     old-time,
     text >= 0.10 && <0.11,
     time,
-    transformers,
+    transformers == 0.2.*,
     unix-compat == 0.2.*,
     zlib
 

diff --git a/src/Snap/Internal/Debug.hs b/src/Snap/Internal/Debug.hs
@@ -19,7 +19,7 @@ module Snap.Internal.Debug where
 import             Control.Concurrent
 import             Control.DeepSeq
 import             Control.Exception
-import "monads-fd" Control.Monad.Trans
+import             Control.Monad.Trans
 import             Data.Char
 import             Data.List
 import             Data.Maybe

diff --git a/src/Snap/Internal/Instances.hs b/src/Snap/Internal/Instances.hs
@@ -4,16 +4,16 @@
 module Snap.Internal.Instances where
 
 import                       Control.Applicative
-import           "monads-fd" Control.Monad.Cont
-import           "monads-fd" Control.Monad.Error
-import           "monads-fd" Control.Monad.List
-import           "monads-fd" Control.Monad.RWS.Strict hiding (pass)
-import qualified "monads-fd" Control.Monad.RWS.Lazy as LRWS
-import           "monads-fd" Control.Monad.Reader
-import           "monads-fd" Control.Monad.State.Strict
-import qualified "monads-fd" Control.Monad.State.Lazy as LState
-import           "monads-fd" Control.Monad.Writer.Strict hiding (pass)
-import qualified "monads-fd" Control.Monad.Writer.Lazy as LWriter
+import                       Control.Monad.Cont
+import                       Control.Monad.Error
+import                       Control.Monad.List
+import                       Control.Monad.RWS.Strict hiding (pass)
+import qualified             Control.Monad.RWS.Lazy as LRWS
+import                       Control.Monad.Reader
+import                       Control.Monad.State.Strict
+import qualified             Control.Monad.State.Lazy as LState
+import                       Control.Monad.Writer.Strict hiding (pass)
+import qualified             Control.Monad.Writer.Lazy as LWriter
 import                       Prelude hiding (catch)
 
 ------------------------------------------------------------------------------

diff --git a/src/Snap/Internal/Iteratee/Debug.hs b/src/Snap/Internal/Iteratee/Debug.hs
@@ -14,7 +14,7 @@ module Snap.Internal.Iteratee.Debug
   ) where
 
 ------------------------------------------------------------------------------
-import "monads-fd" Control.Monad.Trans
+import             Control.Monad.Trans
 import             Data.ByteString (ByteString)
 import             System.IO
 ------------------------------------------------------------------------------

diff --git a/src/Snap/Internal/Types.hs b/src/Snap/Internal/Types.hs
@@ -13,7 +13,7 @@ import "MonadCatchIO-transformers" Control.Monad.CatchIO
 import                       Control.Applicative
 import                       Control.Exception (throwIO, ErrorCall(..))
 import                       Control.Monad
-import           "monads-fd" Control.Monad.State
+import                       Control.Monad.State
 import                       Data.ByteString.Char8 (ByteString)
 import qualified             Data.ByteString.Char8 as S
 import qualified             Data.ByteString.Lazy.Char8 as L

diff --git a/src/Snap/Iteratee.hs b/src/Snap/Iteratee.hs
@@ -107,7 +107,7 @@ import             Control.DeepSeq
 import             Control.Exception (SomeException, assert)
 import             Control.Monad
 import "MonadCatchIO-transformers" Control.Monad.CatchIO
-import "monads-fd" Control.Monad.Trans (MonadIO, lift, liftIO)
+import             Control.Monad.Trans (MonadIO, lift, liftIO)
 import             Data.ByteString (ByteString)
 import qualified   Data.ByteString.Char8 as S
 import qualified   Data.ByteString.Unsafe as S

diff --git a/src/Snap/Util/GZip.hs b/src/Snap/Util/GZip.hs
@@ -14,7 +14,7 @@ import             Control.Concurrent
 import             Control.Applicative hiding (many)
 import             Control.Exception
 import             Control.Monad
-import "monads-fd" Control.Monad.Trans
+import             Control.Monad.Trans
 import             Data.Attoparsec.Char8 hiding (Done)
 import   qualified Data.ByteString.Lazy.Char8 as L
 import             Data.ByteString.Char8 (ByteString)