Commits

Bryan O'Sullivan committed da7f40c Merge

Drop redundant line

  • Participants
  • Parent commits 18b1d0a, 5df79fd

Comments (0)

Files changed (4)

 import Control.DeepSeq (rnf)
 import Control.Exception (bracket, catch, evaluate, finally)
 import Control.Monad (forM_, unless)
+import Control.Monad.Trans.Resource (ResourceT)
 import Data.Aeson ((.=), encode, object)
 import Data.Char (toLower)
-import Data.Conduit (ResourceT)
 import Data.Maybe (catMaybes)
 import Data.Text (Text, pack)
 import Data.Text.Encoding (encodeUtf8)

lib/Network/HTTP/LoadTest.hs

File contents unchanged.

lib/Network/HTTP/LoadTest/Types.hs

 import qualified Data.Text as T
 import qualified Data.Vector as V
 import qualified Data.Vector.Generic as G
+import Control.Monad.Trans.Resource (ResourceT)
 
 newtype Req = Req {
       fromReq :: Request (ResourceT IO)
     criterion,
     deepseq,
     http-conduit,
+    network,
     pronk,
-    network,
+    resourcet,
     text,
     text-format,
     time