Various cleanups

Yesod/Dispatch.hs

@@ -16,6 +16,7 @@ module Yesod.Dispatch
     , SinglePiece (..)
     , MultiPiece (..)
     , Strings
+    , Texts
       -- * Convert to WAI
     , toWaiApp
     , toWaiAppPlain
@@ -27,7 +28,7 @@ import Yesod.Internal.Core
 import Yesod.Handler
 import Yesod.Internal.Dispatch
 
-import Web.Routes.Quasi (SinglePiece, MultiPiece, Strings)
+import Web.Routes.Quasi (SinglePiece (..), MultiPiece (..), Strings)
 import Web.Routes.Quasi.Parse (Resource (..), parseRoutes, parseRoutesFile)
 import Web.Routes.Quasi.TH (THResource, Pieces (..), createRoutes, createRender)
 import Language.Haskell.TH.Syntax
@@ -40,6 +41,9 @@ import Data.ByteString.Lazy.Char8 ()
 
 import Web.ClientSession
 import Data.Char (isUpper)
+import Data.Text (Text)
+
+type Texts = [Text]
 
 -- | Generates URL datatype and site function for the given 'Resource's. This
 -- is used for creating sites, /not/ subsites. See 'mkYesodSub' for the latter.

Yesod/Handler.hs

@@ -129,7 +129,6 @@ import qualified Network.HTTP.Types as H
 import Control.Failure (Failure (failure))
 
 import Text.Hamlet
-import Text.Blaze (preEscapedText)
 import qualified Text.Blaze.Renderer.Text
 import qualified Data.Text as T
 import Data.Text.Encoding (encodeUtf8, decodeUtf8With)

Yesod/Internal/Core.hs

@@ -50,7 +50,7 @@ import Control.Monad.Trans.RWS
 import Text.Hamlet
 import Text.Cassius
 import Text.Julius
-import Text.Blaze (preEscapedLazyText, (!), customAttribute, textTag, toValue)
+import Text.Blaze ((!), customAttribute, textTag, toValue)
 import qualified Text.Blaze.Html5 as TBH
 import Data.Text.Lazy.Builder (toLazyText)
 import Data.Text.Lazy.Encoding (encodeUtf8)
@@ -484,10 +484,7 @@ widgetToPageContent (GWidget w) = do
     let title = maybe mempty unTitle mTitle
     let scripts = runUniqueList scripts'
     let stylesheets = runUniqueList stylesheets'
-    let cssToHtml = preEscapedLazyText . renderCss
+    let jsToHtml (Javascript b) = preEscapedLazyText $ toLazyText b
-        celper :: Cassius url -> Hamlet url
-        celper = fmap cssToHtml
-        jsToHtml (Javascript b) = preEscapedLazyText $ toLazyText b
         jelper :: Julius url -> Hamlet url
         jelper = fmap jsToHtml
 

Yesod/Internal/Dispatch.hs

@@ -156,7 +156,6 @@ mkSimpleExp segments [] frontVars (master, sub, toMasterRoute, mkey, constr, met
     let caseExp = rm `AppE` VarE req
     yr <- [|yesodRunner|]
     cr <- [|fmap chooseRep|]
-    pack <- [|Data.Text.pack|]
     eq <- [|(==)|]
     let url = foldl' AppE (ConE $ mkName constr) $ frontVars []
     let runHandlerVars h = runHandler' $ cr `AppE` foldl' AppE (VarE $ mkName h) (frontVars [])