From 78be263e022c5fb2d2325745cc370e5ad42e3b4d Mon Sep 17 00:00:00 2001
From: Patrick Palka <patrick@parcs.ath.cx>
Date: Mon, 9 Apr 2012 11:09:42 -0400
Subject: [PATCH] [scaffold] remove the cryptic dev/prod combinators

---
 yesod/scaffold/Application.hs.cg          | 5 +++--
 yesod/scaffold/Settings.hs.cg             | 5 +++--
 yesod/scaffold/Settings/Development.hs.cg | 6 ------
 yesod/scaffold/Settings/StaticFiles.hs.cg | 4 +++-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index 64a38706..bf8afa99 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -33,8 +33,9 @@ makeApplication conf logger = do
     app <- toWaiAppPlain foundation
     return $ logWare app
   where
-    logWare = dev logCallbackDev logCallback (logBS setLogger)
-    setLogger = dev id toProduction logger
+    (logWare, setLogger)
+        | development = (logCallbackDev (logBS setLogger), logger)
+        | production  = (logCallback    (logBS setLogger), logger)
 
 makeFoundation :: AppConfig DefaultEnv Extra -> Logger -> IO ~sitearg~
 makeFoundation conf setLogger = do
diff --git a/yesod/scaffold/Settings.hs.cg b/yesod/scaffold/Settings.hs.cg
index 2c8434e6..aa9877e8 100644
--- a/yesod/scaffold/Settings.hs.cg
+++ b/yesod/scaffold/Settings.hs.cg
@@ -54,8 +54,9 @@ staticRoot conf = [st|#{appRoot conf}/static|]
 -- user.
 
 widgetFile :: String -> Q Exp
-widgetFile = dev Yesod.Default.Util.widgetFileReload
-                 Yesod.Default.Util.widgetFileNoReload
+widgetFile
+    | development = Yesod.Default.Util.widgetFileReload
+    | production  = Yesod.Default.Util.widgetFileNoReload
 
 data Extra = Extra
     { extraCopyright :: Text
diff --git a/yesod/scaffold/Settings/Development.hs.cg b/yesod/scaffold/Settings/Development.hs.cg
index 46194f72..73613f0b 100644
--- a/yesod/scaffold/Settings/Development.hs.cg
+++ b/yesod/scaffold/Settings/Development.hs.cg
@@ -10,11 +10,5 @@ development =
   False
 #endif
 
-dev :: a -> a -> a
-dev a b = if development then a else b
-
 production :: Bool
 production = not development
-
-prod :: a -> a -> a
-prod a b = if production then a else b
diff --git a/yesod/scaffold/Settings/StaticFiles.hs.cg b/yesod/scaffold/Settings/StaticFiles.hs.cg
index 759c7427..d0581212 100644
--- a/yesod/scaffold/Settings/StaticFiles.hs.cg
+++ b/yesod/scaffold/Settings/StaticFiles.hs.cg
@@ -8,7 +8,9 @@ import Settings.Development
 
 -- | use this to create your static file serving site
 staticSite :: IO Static.Static
-staticSite = dev Static.staticDevel Static.static staticDir
+staticSite
+    | development = Static.staticDevel staticDir
+    | production  = Static.static      staticDir
 
 -- | This generates easy references to files in the static directory at compile time,
 --   giving you compile-time verification that referenced files exist.