haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to compile with 6.12.1

Browse Source
This commit is contained in:
Michael Snoyman 2009-12-23 08:45:59 +02:00
parent 336f900849
commit 29afbd1b38
4 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Data/Object/Html.hs
View File

@ -31,7 +31,6 @@ module Data.Object.Html
import Data.Generics import Data.Generics
import Data.Object.Text import Data.Object.Text
import Data.Object.Json import Data.Object.Json
import Data.Convertible.Text
import qualified Data.Text.Lazy as TL import qualified Data.Text.Lazy as TL
import Web.Encodings import Web.Encodings
import Text.StringTemplate.Classes import Text.StringTemplate.Classes

1
Hack/Middleware/CleanPath.hs
View File

@ -2,7 +2,6 @@ module Hack.Middleware.CleanPath (cleanPath, splitPath) where
import Hack import Hack
import qualified Data.ByteString.Lazy as BS import qualified Data.ByteString.Lazy as BS
import Data.List
import Web.Encodings import Web.Encodings
import Data.List.Split import Data.List.Split

1
Yesod/Helpers/Static.hs
View File

@ -27,7 +27,6 @@ import System.Directory (doesFileExist)
import Control.Applicative ((<$>)) import Control.Applicative ((<$>))
import Yesod import Yesod
import Yesod.Rep
import Data.List (intercalate) import Data.List (intercalate)
type FileLookup = FilePath -> IO (Maybe B.ByteString) type FileLookup = FilePath -> IO (Maybe B.ByteString)

2
Yesod/Resource.hs
View File

@ -246,7 +246,7 @@ checkRPNodes :: (MonadFailure OverlappingPatterns m,
=> [RPNode] => [RPNode]
-> m [RPNode] -> m [RPNode]
checkRPNodes nodes = do 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 mapM_ (\(RPNode _ v) -> checkVerbMap v) nodes
return nodes return nodes
where where