From 182abd89bffb2d604f5ad51a7be6a7d549afd733 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 3 Jul 2018 19:01:58 +0300
Subject: [PATCH] Drop some deps

---
 yesod-core/Yesod/Core/Dispatch.hs | 4 ++--
 yesod-core/Yesod/Core/Handler.hs  | 5 ++---
 yesod-core/Yesod/Core/Types.hs    | 4 +---
 yesod-core/yesod-core.cabal       | 4 +---
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/yesod-core/Yesod/Core/Dispatch.hs b/yesod-core/Yesod/Core/Dispatch.hs
index 509fbadc..60779532 100644
--- a/yesod-core/Yesod/Core/Dispatch.hs
+++ b/yesod-core/Yesod/Core/Dispatch.hs
@@ -57,7 +57,7 @@ import Yesod.Core.Types
 import Yesod.Core.Class.Yesod
 import Yesod.Core.Class.Dispatch
 import Yesod.Core.Internal.Run
-import Safe (readMay)
+import Text.Read (readMaybe)
 import System.Environment (getEnvironment)
 import qualified System.Random as Random
 import Control.AutoUpdate (mkAutoUpdate, defaultUpdateSettings, updateAction, updateFreq)
@@ -239,7 +239,7 @@ warpEnv site = do
     case lookup "PORT" env of
         Nothing -> error "warpEnv: no PORT environment variable found"
         Just portS ->
-            case readMay portS of
+            case readMaybe portS of
                 Nothing -> error $ "warpEnv: invalid PORT environment variable: " ++ show portS
                 Just port -> warp port site
 
diff --git a/yesod-core/Yesod/Core/Handler.hs b/yesod-core/Yesod/Core/Handler.hs
index 443fd50d..b9a7b7d0 100644
--- a/yesod-core/Yesod/Core/Handler.hs
+++ b/yesod-core/Yesod/Core/Handler.hs
@@ -244,7 +244,6 @@ import           Yesod.Core.Class.Handler
 import           Yesod.Core.Types
 import           Yesod.Routes.Class            (Route)
 import           Data.ByteString.Builder (Builder)
-import           Safe (headMay)
 import           Data.CaseInsensitive (CI, original)
 import qualified Data.Conduit.List as CL
 import           Control.Monad.Trans.Resource  (MonadResource, InternalState, runResourceT, withInternalState, getInternalState, liftResourceT, resourceForkIO)
@@ -601,7 +600,7 @@ setMessageI = addMessageI ""
 -- | Gets just the last message in the user's session,
 -- discards the rest and the status
 getMessage :: MonadHandler m => m (Maybe Html)
-getMessage = fmap (fmap snd . headMay) getMessages
+getMessage = fmap (fmap snd . listToMaybe) getMessages
 
 -- | Bypass remaining handler code and output the given file.
 --
@@ -1317,7 +1316,7 @@ selectRep w = do
     tryAccept ct =
         if subType == "*"
           then if mainType == "*"
-                 then headMay reps
+                 then listToMaybe reps
                  else Map.lookup mainType mainTypeMap
           else lookupAccept ct
         where
diff --git a/yesod-core/Yesod/Core/Types.hs b/yesod-core/Yesod/Core/Types.hs
index 585cf3ca..2500fdbe 100644
--- a/yesod-core/Yesod/Core/Types.hs
+++ b/yesod-core/Yesod/Core/Types.hs
@@ -52,7 +52,6 @@ import           Yesod.Core.Internal.Util           (getTime, putTime)
 import           Yesod.Routes.Class                 (RenderRoute (..), ParseRoute (..))
 import           Control.Monad.Reader               (MonadReader (..))
 import Control.DeepSeq (NFData (rnf))
-import Control.DeepSeq.Generics (genericRnf)
 import Yesod.Core.TypeCache (TypeMap, KeyedTypeMap)
 import Control.Monad.Logger (MonadLoggerIO (..))
 import UnliftIO (MonadUnliftIO (..), UnliftIO (..))
@@ -318,8 +317,7 @@ data ErrorResponse =
     | PermissionDenied !Text
     | BadMethod !H.Method
     deriving (Show, Eq, Typeable, Generic)
-instance NFData ErrorResponse where
-    rnf = genericRnf
+instance NFData ErrorResponse
 
 ----- header stuff
 -- | Headers to be added to a 'Result'.
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 73e2262c..e1862987 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -36,7 +36,6 @@ library
                    , containers            >= 0.2
                    , cookie                >= 0.4.3    && < 0.5
                    , deepseq               >= 1.3
-                   , deepseq-generics
                    , fast-logger           >= 2.2
                    , http-types            >= 0.7
                    , monad-logger          >= 0.3.10   && < 0.4
@@ -45,8 +44,7 @@ library
                    , path-pieces           >= 0.1.2    && < 0.3
                    , random                >= 1.0.0.2  && < 1.2
                    , resourcet             >= 1.2
-                   , safe
-                   , semigroups
+                   , rio
                    , shakespeare           >= 2.0
                    , template-haskell      >= 2.11
                    , text                  >= 0.7