From 29afbd1b3804269b5b978f95830b83b6a440c6b1 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 23 Dec 2009 08:45:59 +0200 Subject: [PATCH] Fixes to compile with 6.12.1 --- Data/Object/Html.hs | 1 - Hack/Middleware/CleanPath.hs | 1 - Yesod/Helpers/Static.hs | 1 - Yesod/Resource.hs | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Data/Object/Html.hs b/Data/Object/Html.hs index 235ff927..c1129d8a 100644 --- a/Data/Object/Html.hs +++ b/Data/Object/Html.hs @@ -31,7 +31,6 @@ module Data.Object.Html import Data.Generics import Data.Object.Text import Data.Object.Json -import Data.Convertible.Text import qualified Data.Text.Lazy as TL import Web.Encodings import Text.StringTemplate.Classes diff --git a/Hack/Middleware/CleanPath.hs b/Hack/Middleware/CleanPath.hs index 0fc1d82c..5afd2558 100644 --- a/Hack/Middleware/CleanPath.hs +++ b/Hack/Middleware/CleanPath.hs @@ -2,7 +2,6 @@ module Hack.Middleware.CleanPath (cleanPath, splitPath) where import Hack import qualified Data.ByteString.Lazy as BS -import Data.List import Web.Encodings import Data.List.Split diff --git a/Yesod/Helpers/Static.hs b/Yesod/Helpers/Static.hs index f0d98293..2b8ba726 100644 --- a/Yesod/Helpers/Static.hs +++ b/Yesod/Helpers/Static.hs @@ -27,7 +27,6 @@ import System.Directory (doesFileExist) import Control.Applicative ((<$>)) import Yesod -import Yesod.Rep import Data.List (intercalate) type FileLookup = FilePath -> IO (Maybe B.ByteString) diff --git a/Yesod/Resource.hs b/Yesod/Resource.hs index 56d1caa6..f0ab2561 100644 --- a/Yesod/Resource.hs +++ b/Yesod/Resource.hs @@ -246,7 +246,7 @@ checkRPNodes :: (MonadFailure OverlappingPatterns m, => [RPNode] -> m [RPNode] checkRPNodes nodes = do - checkPatterns $ map (\(RPNode r _) -> cs r) nodes -- FIXME ugly + _ <- checkPatterns $ map (\(RPNode r _) -> cs r) nodes -- FIXME ugly mapM_ (\(RPNode _ v) -> checkVerbMap v) nodes return nodes where