Skip to content
Browse files

Merge pull request #6 from lbolla/fixes

Fix benchmarks.
  • Loading branch information...
2 parents ca0c216 + c08fe13 commit 234172d87b0c1f67986e5ac0ae142dd1dcb916cc @snoyberg snoyberg committed
Showing with 8 additions and 9 deletions.
  1. +2 −2 bigtable/bigtable.cabal
  2. +3 −3 bigtable/yesod.hs
  3. +1 −1 pong/pong.cabal
  4. +2 −3 pong/yesod.hs
View
4 bigtable/bigtable.cabal
@@ -13,7 +13,7 @@ Cabal-version: >=1.2
Executable warp
Main-is: warp.hs
- Build-depends: base > 4, wai, warp, blaze-builder
+ Build-depends: base > 4, wai, warp, blaze-builder, http-types >= 0.7
Ghc-options: -O2 -threaded -rtsopts
Executable snap
@@ -23,5 +23,5 @@ Executable snap
Executable yesod
Main-is: yesod.hs
- Build-depends: base > 4, yesod-core >= 0.7 && < 0.8, bytestring
+ Build-depends: base > 4, yesod-core >= 1, bytestring
Ghc-options: -O2 -threaded -rtsopts
View
6 bigtable/yesod.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE OverloadedStrings, QuasiQuotes, TypeFamilies, CPP #-}
+{-# LANGUAGE OverloadedStrings, QuasiQuotes, TypeFamilies, CPP, TemplateHaskell, MultiParamTypeClasses #-}
import Yesod.Dispatch
import Yesod.Core
import Yesod.Content
@@ -19,8 +19,8 @@ mkYesod "Pong"
/bigtable.html PongR GET
|]
instance Yesod Pong where
- approot _ = ""
- encryptKey _ = return Nothing
+ makeSessionBackend _ = return Nothing
+
getPongR = return $ RepHtml $ ContentBuilder table Nothing
main = toWaiAppPlain Pong >>= run 3000
View
2 pong/pong.cabal
@@ -13,7 +13,7 @@ Cabal-version: >=1.2
Executable warp
Main-is: warp.hs
- Build-depends: base > 4, wai, warp >= 0.3.2.1, blaze-builder
+ Build-depends: base > 4, wai, warp >= 0.3.2.1, blaze-builder, http-types >= 0.7
Ghc-options: -O2 -threaded -rtsopts
Executable snap
View
5 pong/yesod.hs
@@ -6,13 +6,12 @@ import Data.ByteString (ByteString)
import Network.Wai.Handler.Warp (run)
data Pong = Pong
-mkYesod "Pong" [$parseRoutes|
+mkYesod "Pong" [parseRoutes|
/ PongR GET
|]
instance Yesod Pong where
- approot _ = ""
- encryptKey _ = return Nothing
+ makeSessionBackend _ = return Nothing
getPongR = return $ RepPlain $ toContent ("PONG" :: ByteString)

0 comments on commit 234172d

Please sign in to comment.
Something went wrong with that request. Please try again.