From 59c56c125628072cd234dd9eda0a03663b617445 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 9 Jun 2010 10:14:17 +0300
Subject: [PATCH] Cleaned up warnings

---
 Yesod/Content.hs          | 1 -
 Yesod/Contrib/Crud.hs     | 2 --
 Yesod/Contrib/Formable.hs | 2 +-
 Yesod/Contrib/Persist.hs  | 1 -
 Yesod/Dispatch.hs         | 4 +---
 Yesod/Handler.hs          | 1 -
 Yesod/Helpers/Static.hs   | 6 +++---
 Yesod/Json.hs             | 2 --
 8 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/Yesod/Content.hs b/Yesod/Content.hs
index d388d6a7..bbd6ac5f 100644
--- a/Yesod/Content.hs
+++ b/Yesod/Content.hs
@@ -58,7 +58,6 @@ import qualified Data.Text as T
 import qualified Network.Wai as W
 import qualified Network.Wai.Enumerator as WE
 
-import Data.Function (on)
 import Data.Time
 import System.Locale
 
diff --git a/Yesod/Contrib/Crud.hs b/Yesod/Contrib/Crud.hs
index ab573c8d..6da09ded 100644
--- a/Yesod/Contrib/Crud.hs
+++ b/Yesod/Contrib/Crud.hs
@@ -12,10 +12,8 @@ import Text.Hamlet
 import Control.Monad.IO.Class (liftIO)
 import Web.Routes.Quasi
 import Database.Persist
-import Control.Applicative.Error
 import Yesod.Contrib.Formable hiding (runForm)
 import Yesod.Contrib.Persist
-import Control.Arrow (second)
 import Data.Monoid (mempty)
 
 runForm :: SealedForm (Routes y) a
diff --git a/Yesod/Contrib/Formable.hs b/Yesod/Contrib/Formable.hs
index 6bef2340..5af2ca48 100644
--- a/Yesod/Contrib/Formable.hs
+++ b/Yesod/Contrib/Formable.hs
@@ -164,7 +164,7 @@ instance Fieldable NonEmptyString where
 %input!type=text!name=$string.name$!value=$string.val$
 |]
         notEmpty "" = Left ["Must be non-empty"]
-        notEmpty x = Right $ NonEmptyString x
+        notEmpty y = Right $ NonEmptyString y
 
 share2 :: Monad m => (a -> m [b]) -> (a -> m [b]) -> a -> m [b]
 share2 f g a = do
diff --git a/Yesod/Contrib/Persist.hs b/Yesod/Contrib/Persist.hs
index 51b6f74b..fdb36318 100644
--- a/Yesod/Contrib/Persist.hs
+++ b/Yesod/Contrib/Persist.hs
@@ -5,7 +5,6 @@ module Yesod.Contrib.Persist
     ) where
 
 import Yesod.Handler
-import Yesod.Yesod
 import Database.Persist
 
 class YesodPersist y where
diff --git a/Yesod/Dispatch.hs b/Yesod/Dispatch.hs
index 6472b912..719198f1 100644
--- a/Yesod/Dispatch.hs
+++ b/Yesod/Dispatch.hs
@@ -31,7 +31,6 @@ import Yesod.Internal
 
 import Web.Routes.Quasi
 import Language.Haskell.TH.Syntax
-import Data.List (nub)
 
 import qualified Network.Wai as W
 import qualified Network.Wai.Enumerator as W
@@ -47,10 +46,9 @@ import qualified Data.ByteString.Char8 as B
 import Web.Routes (encodePathInfo)
 
 import qualified Data.ByteString.UTF8 as S
-import qualified Data.ByteString.Lazy.UTF8 as L
 
 import Control.Concurrent.MVar
-import Control.Arrow ((***), first)
+import Control.Arrow ((***))
 
 import Data.Time
 
diff --git a/Yesod/Handler.hs b/Yesod/Handler.hs
index 2bd5efff..c93234cc 100644
--- a/Yesod/Handler.hs
+++ b/Yesod/Handler.hs
@@ -81,7 +81,6 @@ import "MonadCatchIO-transformers" Control.Monad.CatchIO (catch)
 import Control.Monad (liftM, ap)
 
 import System.IO
-import qualified Data.ByteString.Lazy as BL
 import qualified Network.Wai as W
 import Control.Monad.Attempt
 import Data.ByteString.UTF8 (toString)
diff --git a/Yesod/Helpers/Static.hs b/Yesod/Helpers/Static.hs
index 7157b358..74ff1ad0 100644
--- a/Yesod/Helpers/Static.hs
+++ b/Yesod/Helpers/Static.hs
@@ -109,10 +109,10 @@ staticFiles fp = do
     fs <- qRunIO $ getFileList fp
     concat `fmap` mapM go fs
   where
-    replace '.' = '_'
-    replace c = c
+    replace' '.' = '_'
+    replace' c = c
     go f = do
-        let name = mkName $ intercalate "_" $ map (map replace) f
+        let name = mkName $ intercalate "_" $ map (map replace') f
         f' <- lift f
         let sr = ConE $ mkName "StaticRoute"
         return
diff --git a/Yesod/Json.hs b/Yesod/Json.hs
index 4341634e..026819d2 100644
--- a/Yesod/Json.hs
+++ b/Yesod/Json.hs
@@ -21,10 +21,8 @@ import qualified Data.ByteString.Lazy.Char8 as L
 import Data.Char (isControl)
 import Yesod.Hamlet
 import Yesod.Handler
-import Web.Routes.Quasi (Routes)
 import Numeric (showHex)
 import Data.Monoid (Monoid (..))
-import Text.Hamlet
 
 #if TEST
 import Test.Framework (testGroup, Test)