From 213dcbd9856cdb5462caf12d271d8b2b96256b76 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 21 Nov 2014 08:21:15 +0200
Subject: [PATCH] Fix some warnings

---
 yesod/Yesod/Default/Config2.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yesod/Yesod/Default/Config2.hs b/yesod/Yesod/Default/Config2.hs
index 864db657..6c51a562 100644
--- a/yesod/Yesod/Default/Config2.hs
+++ b/yesod/Yesod/Default/Config2.hs
@@ -61,7 +61,7 @@ mergeValues x _ = x
 
 applyEnv :: Bool -- ^ require an environment variable to be present?
          -> H.HashMap Text Text -> Value -> Value
-applyEnv requireEnv env =
+applyEnv requireEnv' env =
     goV
   where
     goV (Object o) = Object $ goV <$> o
@@ -73,7 +73,7 @@ applyEnv requireEnv env =
             Just val -> parseValue val
             Nothing ->
                 case T.stripPrefix ":" t3 of
-                    Just val | not requireEnv -> parseValue val
+                    Just val | not requireEnv' -> parseValue val
                     _ -> Null
     goV v = v
 
@@ -84,7 +84,7 @@ getCurrentEnv = fmap (H.fromList . map (pack *** pack)) getEnvironment
 
 applyCurrentEnv :: Bool -- ^ require an environment variable to be present?
                 -> Value -> IO Value
-applyCurrentEnv requireEnv orig = flip (applyEnv requireEnv) orig <$> getCurrentEnv
+applyCurrentEnv requireEnv' orig = flip (applyEnv requireEnv') orig <$> getCurrentEnv
 
 data EnvUsage = IgnoreEnv
               | UseEnv