Merge pull request #1066 from mschristiansen/warnings

Warnings

yesod-core/Yesod/Core/Class/Handler.hs

@@ -11,12 +11,13 @@ module Yesod.Core.Class.Handler
     ) where
 
 import Yesod.Core.Types
-import Data.Monoid (mempty)
 import Control.Monad (liftM)
 import Control.Monad.IO.Class (liftIO)
 import Control.Monad.Trans.Resource (MonadResource, MonadResourceBase)
 import Control.Monad.Trans.Class (lift)
-import Data.Monoid (Monoid)
+#if __GLASGOW_HASKELL__ < 710
+import Data.Monoid (Monoid, mempty)
+#endif
 import Data.Conduit.Internal (Pipe, ConduitM)
 
 import Control.Monad.Trans.Identity ( IdentityT)

yesod-core/Yesod/Core/Content.hs

@@ -56,8 +56,9 @@ import qualified Data.Text as T
 import Control.Monad (liftM)
 
 import Blaze.ByteString.Builder (Builder, fromByteString, fromLazyByteString)
+#if __GLASGOW_HASKELL__ < 710
 import Data.Monoid (mempty)
-
+#endif
 import Text.Hamlet (Html)
 import Text.Blaze.Html.Renderer.Utf8 (renderHtmlBuilder)
 import Data.Conduit (Source, Flush (Chunk), ResumableSource, mapOutput)
@@ -76,6 +77,7 @@ import Data.Text.Lazy.Builder (toLazyText)
 import Yesod.Core.Types
 import Text.Lucius (Css, renderCss)
 import Text.Julius (Javascript, unJavascript)
+import Data.Word8 (_semicolon, _slash)
 
 -- | Zero-length enumerator.
 emptyContent :: Content
@@ -224,18 +226,15 @@ typeOctet = "application/octet-stream"
 -- For example, \"text/html; charset=utf-8\" is commonly used to specify the
 -- character encoding for HTML data. This function would return \"text/html\".
 simpleContentType :: ContentType -> ContentType
-simpleContentType = fst . B.breakByte 59 -- 59 == ;
+simpleContentType = fst . B.break (== _semicolon)
 
 -- Give just the media types as a pair.
 -- For example, \"text/html; charset=utf-8\" returns ("text", "html")
 contentTypeTypes :: ContentType -> (B.ByteString, B.ByteString)
-contentTypeTypes ct = (main, fst $ B.breakByte semicolon (tailEmpty sub))
+contentTypeTypes ct = (main, fst $ B.break (== _semicolon) (tailEmpty sub))
   where
     tailEmpty x = if B.null x then "" else B.tail x
-    (main, sub) = B.breakByte slash ct
+    (main, sub) = B.break (== _slash) ct
-    slash = 47
-    semicolon = 59
-
 
 instance HasContentType a => HasContentType (DontFullyEvaluate a) where
     getContentType = getContentType . liftM unDontFullyEvaluate

yesod-core/Yesod/Core/Dispatch.hs

@@ -45,7 +45,9 @@ import qualified Network.Wai as W
 import Data.ByteString.Lazy.Char8 ()
 
 import Data.Text (Text)
+#if __GLASGOW_HASKELL__ < 710
 import Data.Monoid (mappend)
+#endif
 import qualified Data.ByteString as S
 import qualified Data.ByteString.Char8 as S8
 import qualified Blaze.ByteString.Builder

yesod-core/Yesod/Core/Handler.hs

@@ -178,7 +178,12 @@ import           Data.Time                     (UTCTime, addUTCTime,
 import           Yesod.Core.Internal.Request   (langKey, mkFileInfoFile,
                                                 mkFileInfoLBS, mkFileInfoSource)
 
-import           Control.Applicative           ((<$>), (<|>))
+
+#if __GLASGOW_HASKELL__ < 710
+import           Control.Applicative           ((<$>))
+import           Data.Monoid                   (mempty, mappend)
+#endif
+import           Control.Applicative           ((<|>))
 import           Control.Exception             (evaluate, SomeException)
 import           Control.Exception.Lifted      (handle)
 
@@ -208,7 +213,7 @@ import           Data.Byteable                 (constEqBytes)
 
 import           Control.Arrow                 ((***))
 import qualified Data.ByteString.Char8         as S8
-import           Data.Monoid                   (Endo (..), mappend, mempty)
+import           Data.Monoid                   (Endo (..))
 import           Data.Text                     (Text)
 import qualified Network.Wai.Parse             as NWP
 import           Text.Shakespeare.I18N         (RenderMessage (..))
@@ -1398,4 +1403,4 @@ validCsrf Nothing            _param = True
 validCsrf (Just _token)     Nothing = False
 
 csrfErrorMessage :: Text
-csrfErrorMessage = "A valid CSRF token wasn't present in HTTP headers or POST parameters. Check the Yesod.Core.Handler docs of the yesod-core package for details on CSRF protection."
+csrfErrorMessage = "A valid CSRF token wasn't present in HTTP headers or POST parameters. Check the Yesod.Core.Handler docs of the yesod-core package for details on CSRF protection."

yesod-core/Yesod/Core/Internal/LiteApp.hs

@@ -1,9 +1,10 @@
-{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeFamilies, PatternGuards, CPP #-}
-{-# LANGUAGE PatternGuards #-}
 module Yesod.Core.Internal.LiteApp where
 
-import Yesod.Routes.Class
+#if __GLASGOW_HASKELL__ < 710
 import Data.Monoid
+#endif
+import Yesod.Routes.Class
 import Yesod.Core.Class.Yesod
 import Yesod.Core.Class.Dispatch
 import Yesod.Core.Types

yesod-core/Yesod/Core/Internal/Run.hs

@@ -7,9 +7,12 @@
 {-# LANGUAGE FlexibleContexts  #-}
 module Yesod.Core.Internal.Run where
 
+
+#if __GLASGOW_HASKELL__ < 710
+import           Data.Monoid                  (mempty)
+#endif
 import Yesod.Core.Internal.Response
 import           Blaze.ByteString.Builder     (toByteString)
-import           Control.Applicative          ((<$>))
 import           Control.Exception            (fromException, evaluate)
 import qualified Control.Exception            as E
 import           Control.Exception.Lifted     (catch)
@@ -25,7 +28,7 @@ import qualified Data.IORef                   as I
 import qualified Data.Map                     as Map
 import           Data.Maybe                   (isJust)
 import           Data.Maybe                   (fromMaybe)
-import           Data.Monoid                  (appEndo, mempty)
+import           Data.Monoid                  (appEndo)
 import           Data.Text                    (Text)
 import qualified Data.Text                    as T
 import           Data.Text.Encoding           (encodeUtf8)
@@ -40,7 +43,6 @@ import           Network.Wai.Internal
 import           Prelude                      hiding (catch)
 #endif
 import           System.Log.FastLogger        (LogStr, toLogStr)
-import           System.Random                (newStdGen)
 import           Yesod.Core.Content
 import           Yesod.Core.Class.Yesod
 import           Yesod.Core.Types
@@ -48,9 +50,9 @@ import           Yesod.Core.Internal.Request  (parseWaiRequest,
                                                tooLargeResponse)
 import           Yesod.Core.Internal.Util     (formatRFC1123)
 import           Yesod.Routes.Class           (Route, renderRoute)
-import Control.DeepSeq (($!!), NFData)
+import           Control.DeepSeq              (($!!))
-import Control.Monad (liftM)
+import           Control.Monad                (liftM)
-import Control.AutoUpdate (mkAutoUpdate, defaultUpdateSettings, updateAction, updateFreq)
+import           Control.AutoUpdate           (mkAutoUpdate, defaultUpdateSettings, updateAction, updateFreq)
 
 returnDeepSessionMap :: Monad m => SessionMap -> m SessionMap
 #if MIN_VERSION_bytestring(0, 10, 0)
@@ -263,7 +265,7 @@ yesodRunner handler' YesodRunnerEnv {..} route req sendResponse
     let mkYesodReq = parseWaiRequest req session (isJust yreSessionBackend) mmaxLen
     let yreq =
             case mkYesodReq of
-                Left yreq -> yreq
+                Left yreq' -> yreq'
                 Right needGen -> needGen yreGen
     let ra = resolveApproot yreSite req
     let log' = messageLoggerSource yreSite yreLogger

yesod-core/Yesod/Core/Types.hs

@@ -10,8 +10,11 @@ module Yesod.Core.Types where
 
 import qualified Blaze.ByteString.Builder           as BBuilder
 import qualified Blaze.ByteString.Builder.Char.Utf8
+#if __GLASGOW_HASKELL__ < 710
 import           Control.Applicative                (Applicative (..))
 import           Control.Applicative                ((<$>))
+import           Data.Monoid                        (Monoid (..))
+#endif
 import           Control.Arrow                      (first)
 import           Control.Exception                  (Exception)
 import           Control.Monad                      (liftM, ap)
@@ -29,8 +32,7 @@ import           Data.Conduit                       (Flush, Source)
 import           Data.IORef                         (IORef)
 import           Data.Map                           (Map, unionWith)
 import qualified Data.Map                           as Map
-import           Data.Monoid                        (Endo (..), Last (..),
+import           Data.Monoid                        (Endo (..), Last (..))
-                                                     Monoid (..))
 import           Data.Serialize                     (Serialize (..),
                                                      putByteString)
 import           Data.String                        (IsString (fromString))

yesod-core/Yesod/Core/Unsafe.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 -- | This is designed to be used as
 --
 -- > qualified import Yesod.Core.Unsafe as Unsafe
@@ -9,7 +10,9 @@ import Yesod.Core.Internal.Run (runFakeHandler)
 
 import Yesod.Core.Types
 import Yesod.Core.Class.Yesod
+#if __GLASGOW_HASKELL__ < 710
 import Data.Monoid            (mempty, mappend)
+#endif
 import Control.Monad.IO.Class (MonadIO)
 
 -- | designed to be used as

yesod-core/Yesod/Routes/TH/RenderRoute.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TemplateHaskell, CPP #-}
 module Yesod.Routes.TH.RenderRoute
     ( -- ** RenderRoute
       mkRenderRouteInstance
@@ -14,7 +14,9 @@ import Control.Monad (replicateM)
 import Data.Text (pack)
 import Web.PathPieces (PathPiece (..), PathMultiPiece (..))
 import Yesod.Routes.Class
+#if __GLASGOW_HASKELL__ < 710
 import Data.Monoid (mconcat)
+#endif
 
 -- | Generate the constructors of a route data type.
 mkRouteCons :: [ResourceTree Type] -> ([Con], [Dec])

yesod-persistent/Yesod/Persist/Core.hs

@@ -81,7 +81,7 @@ newtype DBRunner site = DBRunner
 --
 -- Since 1.2.0
 defaultGetDBRunner :: YesodPersistBackend site ~ SQL.SqlBackend
-                   => (site -> Pool SQL.Connection)
+                   => (site -> Pool SQL.SqlBackend)
                    -> HandlerT site IO (DBRunner site, HandlerT site IO ())
 defaultGetDBRunner getPool = do
     pool <- fmap getPool getYesod

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

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)