From fb4045ea45e7bbd22a982c30abb0e87e2bad0638 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 20 Mar 2013 11:46:32 +0200
Subject: [PATCH] Warning cleanup

---
 yesod-auth/Yesod/Auth.hs                   |  1 -
 yesod-auth/Yesod/Auth/BrowserId.hs         |  2 --
 yesod-auth/Yesod/Auth/Dummy.hs             |  1 -
 yesod-auth/Yesod/Auth/Email.hs             |  2 --
 yesod-auth/Yesod/Auth/GoogleEmail.hs       |  2 --
 yesod-auth/Yesod/Auth/HashDB.hs            |  2 --
 yesod-auth/Yesod/Auth/OpenId.hs            |  2 --
 yesod-auth/Yesod/Auth/Rpxnow.hs            |  3 +--
 yesod-core/Yesod/Core.hs                   |  6 +++++-
 yesod-core/Yesod/Core/Dispatch.hs          |  3 ---
 yesod-core/Yesod/Core/Internal/TH.hs       |  3 ---
 yesod-form/Yesod/Form/Fields.hs            |  4 ++--
 yesod-form/Yesod/Form/Functions.hs         |  3 +--
 yesod-form/Yesod/Form/MassInput.hs         |  2 --
 yesod-form/Yesod/Form/Nic.hs               |  3 +--
 yesod-form/Yesod/Form/Types.hs             |  1 -
 yesod-persistent/Yesod/Persist.hs          |  1 -
 yesod-routes/Yesod/Routes/TH/ParseRoute.hs | 17 ++---------------
 yesod/Yesod.hs                             | 11 -----------
 yesod/Yesod/Default/Util.hs                |  1 -
 yesod/yesod.cabal                          |  7 +++++++
 21 files changed, 19 insertions(+), 58 deletions(-)

diff --git a/yesod-auth/Yesod/Auth.hs b/yesod-auth/Yesod/Auth.hs
index 7f6f0111..90e6a0ed 100644
--- a/yesod-auth/Yesod/Auth.hs
+++ b/yesod-auth/Yesod/Auth.hs
@@ -51,7 +51,6 @@ import qualified Yesod.Auth.Message as Msg
 import Yesod.Form (FormMessage)
 import Data.Typeable (Typeable)
 import Control.Exception (Exception)
-import Control.Monad.Trans.Class
 
 type AuthRoute = Route Auth
 
diff --git a/yesod-auth/Yesod/Auth/BrowserId.hs b/yesod-auth/Yesod/Auth/BrowserId.hs
index c4f561eb..75f1cb57 100644
--- a/yesod-auth/Yesod/Auth/BrowserId.hs
+++ b/yesod-auth/Yesod/Auth/BrowserId.hs
@@ -14,7 +14,6 @@ import Yesod.Core
 import Text.Hamlet (hamlet)
 import qualified Data.Text as T
 import Data.Maybe (fromMaybe)
-import Control.Monad.IO.Class (liftIO)
 import Control.Monad (when)
 import Control.Exception (throwIO)
 import Text.Julius (julius, rawJS)
@@ -22,7 +21,6 @@ import Data.Aeson (toJSON)
 import Network.URI (uriPath, parseURI)
 import Data.FileEmbed (embedFile)
 import Data.ByteString (ByteString)
-import Control.Monad.Trans.Class
 
 pid :: Text
 pid = "browserid"
diff --git a/yesod-auth/Yesod/Auth/Dummy.hs b/yesod-auth/Yesod/Auth/Dummy.hs
index 96d8aa96..9670f709 100644
--- a/yesod-auth/Yesod/Auth/Dummy.hs
+++ b/yesod-auth/Yesod/Auth/Dummy.hs
@@ -11,7 +11,6 @@ import Yesod.Auth
 import Yesod.Form (runInputPost, textField, ireq)
 import Text.Hamlet (hamlet)
 import Yesod.Core
-import Control.Monad.Trans.Class
 
 authDummy :: YesodAuth m => AuthPlugin m
 authDummy =
diff --git a/yesod-auth/Yesod/Auth/Email.hs b/yesod-auth/Yesod/Auth/Email.hs
index 456ce65d..75bb3d47 100644
--- a/yesod-auth/Yesod/Auth/Email.hs
+++ b/yesod-auth/Yesod/Auth/Email.hs
@@ -17,7 +17,6 @@ module Yesod.Auth.Email
 import Network.Mail.Mime (randomString)
 import Yesod.Auth
 import System.Random
-import Text.Blaze.Html (toHtml)
 import Control.Monad (when)
 import Control.Applicative ((<$>), (<*>))
 import Data.Digest.Pure.MD5
@@ -31,7 +30,6 @@ import Control.Monad.Trans.Class
 
 import Yesod.Form
 import Yesod.Core
-import Control.Monad.IO.Class (liftIO)
 import qualified Yesod.Auth.Message as Msg
 
 loginR, registerR, setpassR :: AuthRoute
diff --git a/yesod-auth/Yesod/Auth/GoogleEmail.hs b/yesod-auth/Yesod/Auth/GoogleEmail.hs
index ee11340d..252ddc70 100644
--- a/yesod-auth/Yesod/Auth/GoogleEmail.hs
+++ b/yesod-auth/Yesod/Auth/GoogleEmail.hs
@@ -19,12 +19,10 @@ import Yesod.Auth
 import qualified Web.Authenticate.OpenId as OpenId
 
 import Yesod.Core
-import Text.Blaze.Html (toHtml)
 import Data.Text (Text)
 import qualified Yesod.Auth.Message as Msg
 import qualified Data.Text as T
 import Control.Exception.Lifted (try, SomeException)
-import Control.Monad.Trans.Class
 
 pid :: Text
 pid = "googleemail"
diff --git a/yesod-auth/Yesod/Auth/HashDB.hs b/yesod-auth/Yesod/Auth/HashDB.hs
index 4c268e64..4dfeb29b 100644
--- a/yesod-auth/Yesod/Auth/HashDB.hs
+++ b/yesod-auth/Yesod/Auth/HashDB.hs
@@ -80,8 +80,6 @@ import Text.Hamlet (hamlet)
 
 import Control.Applicative         ((<$>), (<*>))
 import Control.Monad               (replicateM,liftM)
-import Control.Monad.IO.Class      (MonadIO, liftIO)
-import Control.Monad.Trans.Class   (lift)
 
 import qualified Data.ByteString.Lazy.Char8 as BS (pack)
 import Data.Digest.Pure.SHA        (sha1, showDigest)
diff --git a/yesod-auth/Yesod/Auth/OpenId.hs b/yesod-auth/Yesod/Auth/OpenId.hs
index 21a00e87..beaaa7c5 100644
--- a/yesod-auth/Yesod/Auth/OpenId.hs
+++ b/yesod-auth/Yesod/Auth/OpenId.hs
@@ -16,12 +16,10 @@ import qualified Web.Authenticate.OpenId as OpenId
 import Yesod.Form
 import Yesod.Core
 import Text.Cassius (cassius)
-import Text.Blaze.Html (toHtml)
 import Data.Text (Text, isPrefixOf)
 import qualified Yesod.Auth.Message as Msg
 import Control.Exception.Lifted (SomeException, try)
 import Data.Maybe (fromMaybe)
-import Control.Monad.Trans.Class
 
 forwardUrl :: AuthRoute
 forwardUrl = PluginR "openid" ["forward"]
diff --git a/yesod-auth/Yesod/Auth/Rpxnow.hs b/yesod-auth/Yesod/Auth/Rpxnow.hs
index bb6bce57..dc674e68 100644
--- a/yesod-auth/Yesod/Auth/Rpxnow.hs
+++ b/yesod-auth/Yesod/Auth/Rpxnow.hs
@@ -12,12 +12,11 @@ import Control.Monad (mplus)
 
 import Yesod.Core
 import Text.Hamlet (hamlet)
-import Data.Text (pack, unpack, Text)
+import Data.Text (pack, unpack)
 import Data.Text.Encoding (encodeUtf8, decodeUtf8With)
 import Data.Text.Encoding.Error (lenientDecode)
 import Control.Arrow ((***))
 import Network.HTTP.Types (renderQuery)
-import Control.Monad.Trans.Class
 
 authRpxnow :: YesodAuth m
            => String -- ^ app name
diff --git a/yesod-core/Yesod/Core.hs b/yesod-core/Yesod/Core.hs
index 2a292b8b..2ed8a7f2 100644
--- a/yesod-core/Yesod/Core.hs
+++ b/yesod-core/Yesod/Core.hs
@@ -72,6 +72,8 @@ module Yesod.Core
     , MonadIO (..)
     , MonadBase (..)
     , MonadBaseControl
+    , MonadResource (..)
+    , MonadLogger
     ) where
 
 import Yesod.Core.Content
@@ -83,7 +85,7 @@ import Yesod.Core.Json
 import Yesod.Core.Types
 import Text.Shakespeare.I18N
 import Yesod.Core.Internal.Util (formatW3 , formatRFC1123 , formatRFC822)
-import Text.Blaze.Html (Html)
+import Text.Blaze.Html (Html, toHtml, preEscapedToMarkup)
 
 import Control.Monad.Logger
 import Control.Monad.Trans.Class (MonadTrans (..))
@@ -98,6 +100,8 @@ import Yesod.Routes.Class
 import Control.Monad.IO.Class (MonadIO (..))
 import Control.Monad.Base (MonadBase (..))
 import Control.Monad.Trans.Control (MonadBaseControl (..))
+
+import Control.Monad.Trans.Resource (MonadResource (..))
 import Yesod.Core.Internal.LiteApp
 
 -- | Return an 'Unauthorized' value, with the given i18n message.
diff --git a/yesod-core/Yesod/Core/Dispatch.hs b/yesod-core/Yesod/Core/Dispatch.hs
index 4e568628..95e3b4f1 100644
--- a/yesod-core/Yesod/Core/Dispatch.hs
+++ b/yesod-core/Yesod/Core/Dispatch.hs
@@ -47,14 +47,11 @@ import qualified Blaze.ByteString.Builder
 import Network.HTTP.Types (status301)
 import Yesod.Routes.Parse
 import Yesod.Core.Types
-import Yesod.Core.Content
 import Yesod.Core.Class.Yesod
 import Yesod.Core.Class.Dispatch
 import Yesod.Core.Internal.Run
-import Yesod.Routes.Class
 import Safe (readMay)
 import System.Environment (getEnvironment)
-import Data.Monoid (Monoid (..))
 
 import Network.Wai.Middleware.Autohead
 import Network.Wai.Middleware.AcceptOverride
diff --git a/yesod-core/Yesod/Core/Internal/TH.hs b/yesod-core/Yesod/Core/Internal/TH.hs
index 5b8318fd..9ed273f1 100644
--- a/yesod-core/Yesod/Core/Internal/TH.hs
+++ b/yesod-core/Yesod/Core/Internal/TH.hs
@@ -22,9 +22,6 @@ import Yesod.Core.Types
 import Yesod.Core.Content
 import Yesod.Core.Class.Dispatch
 import Yesod.Core.Internal.Run
-import Yesod.Routes.Class
-import Data.Text (Text)
-import qualified Data.ByteString.Char8 as S8
 
 -- | Generates URL datatype and site function for the given 'Resource's. This
 -- is used for creating sites, /not/ subsites. See 'mkYesodSub' for the latter.
diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
index 72883e08..bd900870 100644
--- a/yesod-form/Yesod/Form/Fields.hs
+++ b/yesod-form/Yesod/Form/Fields.hs
@@ -51,7 +51,7 @@ import Yesod.Form.I18n.English
 import Yesod.Form.Functions (parseHelper)
 import Yesod.Core
 import Text.Hamlet
-import Text.Blaze (ToMarkup (toMarkup), preEscapedToMarkup, unsafeByteString)
+import Text.Blaze (ToMarkup (toMarkup), unsafeByteString)
 #define ToHtml ToMarkup
 #define toHtml toMarkup
 #define preEscapedText preEscapedToMarkup
@@ -80,7 +80,7 @@ import Data.Text (Text, unpack, pack)
 import qualified Data.Text.Read
 
 import qualified Data.Map as Map
-import Yesod.Persist (selectList, runDB, Filter, SelectOpt, YesodPersistBackend, Key, YesodPersist, PersistEntity, PersistQuery, YesodDB)
+import Yesod.Persist (selectList, runDB, Filter, SelectOpt, Key, YesodPersist, PersistEntity, PersistQuery, YesodDB)
 import Control.Arrow ((&&&))
 
 import Control.Applicative ((<$>), (<|>))
diff --git a/yesod-form/Yesod/Form/Functions.hs b/yesod-form/Yesod/Form/Functions.hs
index 40b29929..82641317 100644
--- a/yesod-form/Yesod/Form/Functions.hs
+++ b/yesod-form/Yesod/Form/Functions.hs
@@ -28,7 +28,7 @@ module Yesod.Form.Functions
     , FormRender
     , renderTable
     , renderDivs
-    , renderDivsNoLabels 
+    , renderDivsNoLabels
     , renderBootstrap
       -- * Validation
     , check
@@ -41,7 +41,6 @@ module Yesod.Form.Functions
     , parseHelper
     ) where
 
-import Control.Monad.Trans.Resource (MonadResource)
 import Yesod.Form.Types
 import Data.Text (Text, pack)
 import Control.Arrow (second)
diff --git a/yesod-form/Yesod/Form/MassInput.hs b/yesod-form/Yesod/Form/MassInput.hs
index 326d8c00..332eb660 100644
--- a/yesod-form/Yesod/Form/MassInput.hs
+++ b/yesod-form/Yesod/Form/MassInput.hs
@@ -13,7 +13,6 @@ import Yesod.Form.Types
 import Yesod.Form.Functions
 import Yesod.Form.Fields (boolField)
 import Yesod.Core
-import Text.Blaze.Html (Html)
 import Control.Monad.Trans.RWS (get, put, ask)
 import Data.Maybe (fromMaybe)
 import Data.Text.Read (decimal)
@@ -22,7 +21,6 @@ import Data.Either (partitionEithers)
 import Data.Traversable (sequenceA)
 import qualified Data.Map as Map
 import Data.Maybe (listToMaybe)
-import Control.Monad.Trans.Class
 
 down :: Monad m => Int -> MForm m ()
 down 0 = return ()
diff --git a/yesod-form/Yesod/Form/Nic.hs b/yesod-form/Yesod/Form/Nic.hs
index 28afc50c..28626789 100644
--- a/yesod-form/Yesod/Form/Nic.hs
+++ b/yesod-form/Yesod/Form/Nic.hs
@@ -12,9 +12,8 @@ module Yesod.Form.Nic
 import Yesod.Core
 import Yesod.Form
 import Text.HTML.SanitizeXSS (sanitizeBalance)
-import Text.Hamlet (Html, shamlet)
+import Text.Hamlet (shamlet)
 import Text.Julius (julius, rawJS)
-import Text.Blaze (preEscapedToMarkup)
 import Text.Blaze.Html.Renderer.String (renderHtml)
 import Data.Text (Text, pack)
 import Data.Maybe (listToMaybe)
diff --git a/yesod-form/Yesod/Form/Types.hs b/yesod-form/Yesod/Form/Types.hs
index 5107a619..5dc79657 100644
--- a/yesod-form/Yesod/Form/Types.hs
+++ b/yesod-form/Yesod/Form/Types.hs
@@ -22,7 +22,6 @@ module Yesod.Form.Types
     ) where
 
 import Control.Monad.Trans.RWS (RWST)
-import Yesod.Core (FileInfo)
 import Data.Text (Text)
 import Data.Monoid (Monoid (..))
 import Text.Blaze (Markup, ToMarkup (toMarkup))
diff --git a/yesod-persistent/Yesod/Persist.hs b/yesod-persistent/Yesod/Persist.hs
index ae209ee6..3d4e5504 100644
--- a/yesod-persistent/Yesod/Persist.hs
+++ b/yesod-persistent/Yesod/Persist.hs
@@ -12,7 +12,6 @@ module Yesod.Persist
 
 import Database.Persist
 import Database.Persist.TH
-import Control.Monad.Trans.Class (MonadTrans, lift)
 
 import Yesod.Core
 
diff --git a/yesod-routes/Yesod/Routes/TH/ParseRoute.hs b/yesod-routes/Yesod/Routes/TH/ParseRoute.hs
index 38d2f142..b61037ba 100644
--- a/yesod-routes/Yesod/Routes/TH/ParseRoute.hs
+++ b/yesod-routes/Yesod/Routes/TH/ParseRoute.hs
@@ -6,33 +6,20 @@ module Yesod.Routes.TH.ParseRoute
 
 import Yesod.Routes.TH.Types
 import Language.Haskell.TH.Syntax
-import Data.Maybe (maybeToList)
-import Control.Monad (replicateM)
 import Data.Text (pack)
 import Web.PathPieces (PathPiece (..), PathMultiPiece (..))
 import Yesod.Routes.Class
-import Data.Monoid (mconcat)
 import qualified Yesod.Routes.Dispatch as D
 import Data.List (foldl')
 import Control.Applicative ((<$>))
-import Yesod.Routes.TH.Types
-import Language.Haskell.TH.Syntax
 import Data.Maybe (catMaybes)
-import Control.Monad (forM, replicateM)
-import Data.Text (pack)
-import qualified Yesod.Routes.Dispatch as D
-import qualified Data.Map as Map
-import Data.Char (toLower)
-import Web.PathPieces (PathPiece (..), PathMultiPiece (..))
-import Control.Applicative ((<$>))
-import Data.List (foldl')
-import Data.Text.Encoding (encodeUtf8)
+import Control.Monad (forM)
 import Control.Monad (join)
 
 -- | Clauses for the 'parseRoute' method.
 mkParseRouteClauses :: [ResourceTree a] -> Q [Clause]
 mkParseRouteClauses ress' = do
-    pieces <- newName "pieces"
+    pieces <- newName "pieces0"
     dispatch <- newName "dispatch"
     query <- newName "_query"
 
diff --git a/yesod/Yesod.hs b/yesod/Yesod.hs
index 7210ac8d..2ee9080d 100644
--- a/yesod/Yesod.hs
+++ b/yesod/Yesod.hs
@@ -8,8 +8,6 @@ module Yesod
     , module Yesod.Persist
       -- * Commonly referenced functions/datatypes
     , Application
-    , liftIO
-    , MonadBaseControl
       -- * Utilities
     , showIntegral
     , readIntegral
@@ -18,8 +16,6 @@ module Yesod
     , hamlet
     , xhamlet
     , HtmlUrl
-    , Html
-    , toHtml
       -- ** Julius
     , julius
     , JavascriptUrl
@@ -40,15 +36,8 @@ import Text.Julius
 
 import Yesod.Form
 import Yesod.Persist
-import Control.Monad.IO.Class (liftIO, MonadIO(..))
-import Control.Monad.Trans.Control (MonadBaseControl)
 
 import Network.Wai
-import Network.Wai.Middleware.RequestLogger (logStdout)
-import Network.Wai.Handler.Warp (run)
-import System.IO (stderr, hPutStrLn)
-import Text.Blaze.Html (toHtml)
-import System.Environment (getEnv)
 import Data.Aeson (toJSON)
 
 showIntegral :: Integral a => a -> String
diff --git a/yesod/Yesod/Default/Util.hs b/yesod/Yesod/Default/Util.hs
index 2f1895a1..a10358ec 100644
--- a/yesod/Yesod/Default/Util.hs
+++ b/yesod/Yesod/Default/Util.hs
@@ -14,7 +14,6 @@ module Yesod.Default.Util
     , wfsHamletSettings
     ) where
 
-import Control.Monad.IO.Class (liftIO)
 import qualified Data.ByteString.Lazy as L
 import Data.Text (Text, pack, unpack)
 import Yesod.Core -- purposely using complete import so that Haddock will see addStaticContent
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 91dd4ef2..9954a3d5 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -36,6 +36,13 @@ library
                    , aeson
                    , safe
                    , data-default
+                   , network-conduit
+                   , unordered-containers
+                   , yaml
+                   , text
+                   , directory
+                   , template-haskell
+                   , bytestring
 
     exposed-modules: Yesod
                    , Yesod.Default.Config