refreshed haskell patches

This commit is contained in:
Joey Hess 2014-06-11 03:35:19 +01:00
parent 5ec8bcfaa7
commit 2b8dbfe7ab
8 changed files with 102 additions and 103 deletions

View file

@ -1,13 +1,13 @@
From 86264ab2a76568585cacca9145e440d6c06edbe3 Mon Sep 17 00:00:00 2001
From da032b804c0a35c2831664e28c9211f4fe712593 Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com>
Date: Wed, 21 May 2014 06:30:03 +0000
Date: Tue, 10 Jun 2014 20:39:42 +0000
Subject: [PATCH] avoid TH
---
Yesod.hs | 19 ++++++++++++--
Yesod/Default/Main.hs | 31 +----------------------
Yesod/Default/Main.hs | 32 +-----------------------
Yesod/Default/Util.hs | 69 ++-------------------------------------------------
3 files changed, 20 insertions(+), 99 deletions(-)
3 files changed, 20 insertions(+), 100 deletions(-)
diff --git a/Yesod.hs b/Yesod.hs
index b367144..fbe309c 100644
@ -41,7 +41,7 @@ index b367144..fbe309c 100644
+insert = undefined
+
diff --git a/Yesod/Default/Main.hs b/Yesod/Default/Main.hs
index e273de2..bf46642 100644
index 565ed35..41c2df0 100644
--- a/Yesod/Default/Main.hs
+++ b/Yesod/Default/Main.hs
@@ -1,10 +1,8 @@
@ -64,7 +64,7 @@ index e273de2..bf46642 100644
import System.Log.FastLogger (LogStr, toLogStr)
import Language.Haskell.TH.Syntax (qLocation)
@@ -55,33 +53,6 @@ defaultMain load getApp = do
@@ -55,34 +53,6 @@ defaultMain load getApp = do
type LogFunc = Loc -> LogSource -> LogLevel -> LogStr -> IO ()
@ -90,14 +90,15 @@ index e273de2..bf46642 100644
- } app
- where
- shouldLog' =
-#if MIN_VERSION_wai(2,1,3)
-#if MIN_VERSION_warp(2,1,3)
- Warp.defaultShouldDisplayException
-#else
- const True
-#endif
-
-- | Run your application continously, listening for SIGINT and exiting
-- when received
--
diff --git a/Yesod/Default/Util.hs b/Yesod/Default/Util.hs
index a10358e..0547424 100644
--- a/Yesod/Default/Util.hs
@ -195,5 +196,5 @@ index a10358e..0547424 100644
- else return $ Just ex
- else return Nothing
--
2.0.0.rc2
2.0.0