Reflect wai changes for #262

yesod-core/Yesod/Handler.hs

@@ -178,7 +178,6 @@ import Control.Monad.Trans.Resource
 import Control.Monad.Base
 import Yesod.Routes.Class
 import Data.Word (Word64)
-import Data.Conduit (Sink)
 import Language.Haskell.TH.Syntax (Loc)
 
 class YesodSubRoute s y where
@@ -343,12 +342,12 @@ rbHelper upload =
         FileUploadDisk s -> rbHelper' s mkFileInfoFile
         FileUploadSource s -> rbHelper' s mkFileInfoSource
 
-rbHelper' :: Sink S8.ByteString (ResourceT IO) x
+rbHelper' :: NWP.BackEnd x
           -> (Text -> Text -> x -> FileInfo)
           -> W.Request
           -> ResourceT IO ([(Text, Text)], [(Text, FileInfo)])
-rbHelper' sink mkFI req =
-    (map fix1 *** map fix2) <$> (NWP.parseRequestBody sink req)
+rbHelper' backend mkFI req =
+    (map fix1 *** map fix2) <$> (NWP.parseRequestBody backend req)
   where
     fix1 = go *** go
     fix2 (x, NWP.FileInfo a b c) =

yesod-core/Yesod/Internal/Core.hs

@@ -83,7 +83,7 @@ import Data.Aeson (Value (Array, String))
 import Data.Aeson.Encode (encode)
 import qualified Data.Vector as Vector
 import Network.Wai.Middleware.Gzip (GzipSettings, def)
-import Network.Wai.Parse (tempFileSink, lbsSink)
+import Network.Wai.Parse (tempFileBackEnd, lbsBackEnd)
 import qualified Paths_yesod_core
 import Data.Version (showVersion)
 import System.Log.FastLogger (Logger, mkLogger, loggerDate, LogStr (..), loggerPutStr)
@@ -340,8 +340,8 @@ $doctype 5
                -> Word64 -- ^ request body size
                -> FileUpload
     fileUpload _ size
-        | size > 50000 = FileUploadDisk tempFileSink
-        | otherwise = FileUploadMemory lbsSink
+        | size > 50000 = FileUploadDisk tempFileBackEnd
+        | otherwise = FileUploadMemory lbsBackEnd
 
 formatLogMessage :: IO ZonedDate
                  -> Loc

yesod-core/Yesod/Internal/Request.hs

@@ -145,6 +145,6 @@ mkFileInfoFile name ct fp = FileInfo name ct (sourceFile fp) (\dst -> runResourc
 mkFileInfoSource :: Text -> Text -> Source (ResourceT IO) ByteString -> FileInfo
 mkFileInfoSource name ct src = FileInfo name ct src (\dst -> runResourceT $ src $$ sinkFile dst)
 
-data FileUpload = FileUploadMemory (Sink ByteString (ResourceT IO) L.ByteString)
-                | FileUploadDisk (Sink ByteString (ResourceT IO) FilePath)
-                | FileUploadSource (Sink ByteString (ResourceT IO) (Source (ResourceT IO) ByteString))
+data FileUpload = FileUploadMemory (NWP.BackEnd L.ByteString)
+                | FileUploadDisk (NWP.BackEnd FilePath)
+                | FileUploadSource (NWP.BackEnd (Source (ResourceT IO) ByteString))