6bacab4 · hakyll · git.iko.soy

git.iko.soy/hakyll

Fixed warnings when compiling with the new GHC 6.12.1.

commit6bacab4f22213df62d6162296a209173701171b8 authorJasper Van der Jeugt <jaspervdj@gmail.com> dateSun 17 Jan 2010, 09:57 (17 years ago) parentd6c2cec

5 files changed+4−8

compare with master

unifiedsplit

src/Network/Hakyll/SimpleServer.hs+2−3 src/Text/Hakyll/Page.hs+1−1 src/Text/Hakyll/Render.hs+1−2 src/Text/Hakyll/Renderable.hs−1 src/Text/Hakyll/Renderables.hs−1

src/Network/Hakyll/SimpleServer.hs+2−3

@@ -6,7 +6,7 @@ module Network.Hakyll.SimpleServer

77import Prelude hiding (log)

88import Network

9−import Control.Monad (forever, mapM_)

9+import Control.Monad (forever)

1010import Control.Monad.Reader (ReaderT, runReaderT, ask, liftIO)

1111import System.IO

1212import System.Directory (doesFileExist, doesDirectoryExist)

@@ -202,10 +202,9 @@ simpleServer port root = do

202202 -- When a client connects, respond in a separate thread.

203203 listen socket = do (handle, _, _) <- accept socket

204204 forkIO (runReaderT (respond handle) config)

205− return ()

206205

207206 -- Handle logging in a separate thread

208− forkIO (log logChan)

207+ _ <- forkIO (log logChan)

209208

210209 writeChan logChan $ "Starting hakyll server on port " ++ show port ++ "..."

211210 socket <- listenOn (PortNumber port)

src/Text/Hakyll/Page.hs+1−1

@@ -13,7 +13,7 @@ import Data.Maybe (fromMaybe)

1313import Control.Parallel.Strategies (rdeepseq, ($|))

1414import Control.Monad.Reader (liftIO)

1515

16−import System.FilePath (FilePath, takeExtension)

16+import System.FilePath (takeExtension)

1717import System.IO

1818

1919import Text.Hakyll.Hakyll (Hakyll)

src/Text/Hakyll/Render.hs+1−2

@@ -10,11 +10,10 @@ module Text.Hakyll.Render

1010 , css

1111 ) where

1212

13−import Control.Monad (unless, mapM)

13+import Control.Monad (unless)

1414import Control.Monad.Reader (liftIO)

1515

1616import System.Directory (copyFile)

17−import System.IO

1817

1918import Text.Hakyll.Hakyll (Hakyll)

2019import Text.Hakyll.Context (ContextManipulation)

src/Text/Hakyll/Renderable.hs−1

@@ -3,7 +3,6 @@ module Text.Hakyll.Renderable

33 ) where

55import Text.Hakyll.Hakyll (Hakyll)

6−import System.FilePath (FilePath)

76import Text.Hakyll.Context (Context)

98-- | A class for datatypes that can be rendered to pages.

src/Text/Hakyll/Renderables.hs−1

@@ -6,7 +6,6 @@ module Text.Hakyll.Renderables

66 ) where

88import Text.Hakyll.Hakyll (Hakyll)

9−import System.FilePath (FilePath)

109import qualified Data.Map as M

1110import Text.Hakyll.Page

1211import Text.Hakyll.Renderable