Some more rearranging

yesod-core/Yesod/Content.hs

@@ -40,10 +40,6 @@ module Yesod.Content
     , RepHtmlJson (..)
     , RepPlain (..)
     , RepXml (..)
-      -- * Utilities
-    , formatW3
-    , formatRFC1123
-    , formatRFC822
     ) where
 
 import Data.Maybe (mapMaybe)
@@ -52,9 +48,6 @@ import qualified Data.ByteString.Lazy as L
 import Data.Text.Lazy (Text, pack)
 import qualified Data.Text as T
 
-import Data.Time
-import System.Locale
-
 import qualified Data.Text.Encoding
 import qualified Data.Text.Lazy.Encoding
 
@@ -222,18 +215,6 @@ typeOctet = "application/octet-stream"
 simpleContentType :: ContentType -> ContentType
 simpleContentType = fst . B.breakByte 59 -- 59 == ;
 
--- | Format a 'UTCTime' in W3 format.
-formatW3 :: UTCTime -> T.Text
-formatW3 = T.pack . formatTime defaultTimeLocale "%FT%X-00:00"
-
--- | Format as per RFC 1123.
-formatRFC1123 :: UTCTime -> T.Text
-formatRFC1123 = T.pack . formatTime defaultTimeLocale "%a, %d %b %Y %X %Z"
-
--- | Format as per RFC 822.
-formatRFC822 :: UTCTime -> T.Text
-formatRFC822 = T.pack . formatTime defaultTimeLocale "%a, %d %b %Y %H:%M:%S %z"
-
 instance HasReps a => HasReps (DontFullyEvaluate a) where
     chooseRep (DontFullyEvaluate a) = fmap (fmap (fmap ContentDontEvaluate)) $ chooseRep a
 

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

@@ -1,12 +1,17 @@
-module Yesod.Core.Time
+module Yesod.Core.Internal.Util
     ( putTime
     , getTime
+    , formatW3
+    , formatRFC1123
+    , formatRFC822
     ) where
 
 import           Data.Int       (Int64)
 import           Data.Serialize (Get, Put, Serialize (..))
+import qualified Data.Text      as T
 import           Data.Time      (Day (ModifiedJulianDay, toModifiedJulianDay),
-                                 DiffTime, UTCTime (..))
+                                 DiffTime, UTCTime (..), formatTime)
+import           System.Locale  (defaultTimeLocale)
 
 putTime :: UTCTime -> Put
 putTime (UTCTime d t) =
@@ -27,3 +32,15 @@ posixDayLength_int64 = 86400
 
 diffTimeScale :: DiffTime
 diffTimeScale = 1e12
+
+-- | Format a 'UTCTime' in W3 format.
+formatW3 :: UTCTime -> T.Text
+formatW3 = T.pack . formatTime defaultTimeLocale "%FT%X-00:00"
+
+-- | Format as per RFC 1123.
+formatRFC1123 :: UTCTime -> T.Text
+formatRFC1123 = T.pack . formatTime defaultTimeLocale "%a, %d %b %Y %X %Z"
+
+-- | Format as per RFC 822.
+formatRFC822 :: UTCTime -> T.Text
+formatRFC822 = T.pack . formatTime defaultTimeLocale "%a, %d %b %Y %H:%M:%S %z"

yesod-core/Yesod/Core/Types.hs

@@ -50,7 +50,7 @@ import           Text.Blaze.Html                    (Html)
 import           Text.Hamlet                        (HtmlUrl)
 import           Text.Julius                        (JavascriptUrl)
 import           Web.Cookie                         (SetCookie)
-import           Yesod.Core.Time                    (getTime, putTime)
+import           Yesod.Core.Internal.Util           (getTime, putTime)
 import           Yesod.Core.Trans.Class             (MonadLift (..))
 import           Yesod.Routes.Class                 (RenderRoute (..))
 

yesod-core/Yesod/Handler.hs

@@ -1,16 +1,11 @@
-{-# LANGUAGE CPP                        #-}
-{-# LANGUAGE DeriveDataTypeable         #-}
 {-# LANGUAGE FlexibleContexts           #-}
 {-# LANGUAGE FlexibleInstances          #-}
 {-# LANGUAGE FunctionalDependencies     #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE MultiParamTypeClasses      #-}
 {-# LANGUAGE OverloadedStrings          #-}
 {-# LANGUAGE QuasiQuotes                #-}
 {-# LANGUAGE RecordWildCards            #-}
 {-# LANGUAGE TupleSections              #-}
 {-# LANGUAGE TypeFamilies               #-}
-{-# LANGUAGE TypeSynonymInstances       #-}
 ---------------------------------------------------------
 --
 -- Module        : Yesod.Handler
@@ -157,8 +152,8 @@ import qualified Network.Wai.Parse             as NWP
 import           Text.Shakespeare.I18N         (RenderMessage (..))
 import           Web.Cookie                    (SetCookie (..))
 import           Yesod.Content                 (HasReps, chooseRep,
-                                                formatRFC1123, toContent)
+                                                toContent)
-
+import           Yesod.Core.Internal.Util      (formatRFC1123)
 import           Text.Blaze.Html               (preEscapedToMarkup, toHtml)
 
 import           Control.Monad.Trans.Resource  (ResourceT, runResourceT)

yesod-core/Yesod/Internal/Session.hs

@@ -14,7 +14,7 @@ import Data.ByteString (ByteString)
 import Control.Concurrent (forkIO, killThread, threadDelay)
 import Control.Monad (forever, guard)
 import Yesod.Core.Types
-import Yesod.Core.Time
+import Yesod.Core.Internal.Util
 import qualified Data.IORef as I
 
 encodeClientSession :: CS.Key

yesod-core/yesod-core.cabal

@@ -98,7 +98,7 @@ library
                      Yesod.Core.Internal.Request
     other-modules:   Yesod.Internal.Core
                      Yesod.Internal.Session
-                     Yesod.Core.Time
+                     Yesod.Core.Internal.Util
                      Yesod.Core.Trans.Class
                      Yesod.Core.Run
                      Yesod.Core.Class