From 233fc03532ce605ef15e6d79dde5d41a69c2f5dc Mon Sep 17 00:00:00 2001 From: Mikkel Christiansen Date: Wed, 26 Aug 2015 14:22:12 +0200 Subject: [PATCH] Ghc710 conditional import and remove unused toUpper. --- yesod/Yesod/Default/Config.hs | 2 +- yesod/Yesod/Default/Config2.hs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/yesod/Yesod/Default/Config.hs b/yesod/Yesod/Default/Config.hs index dba3889d..6e2dbf45 100644 --- a/yesod/Yesod/Default/Config.hs +++ b/yesod/Yesod/Default/Config.hs @@ -15,7 +15,7 @@ module Yesod.Default.Config , withYamlEnvironment ) where -import Data.Char (toUpper, toLower) +import Data.Char (toUpper) import Data.Text (Text) import qualified Data.Text as T import Data.Yaml diff --git a/yesod/Yesod/Default/Config2.hs b/yesod/Yesod/Default/Config2.hs index fed812b9..e477d216 100644 --- a/yesod/Yesod/Default/Config2.hs +++ b/yesod/Yesod/Default/Config2.hs @@ -20,7 +20,11 @@ module Yesod.Default.Config2 , requireCustomEnv ) where + +#if __GLASGOW_HASKELL__ < 710 +import Control.Applicative ((<$>)) import Data.Monoid +#endif import Data.Semigroup import Data.List.NonEmpty (nonEmpty) import Data.Aeson @@ -28,7 +32,6 @@ import qualified Data.HashMap.Strict as H import Data.Text (Text, pack) import System.Environment (getEnvironment, getArgs) import Control.Arrow ((***)) -import Control.Applicative ((<$>)) import Control.Monad (forM) import Control.Exception (throwIO) import Data.Text.Encoding (encodeUtf8)