haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some warnings

Browse Source
This commit is contained in:
Michael Snoyman 2014-11-21 08:21:15 +02:00
parent 11ae185c83
commit 213dcbd985
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yesod/Yesod/Default/Config2.hs
View File

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