a180016 · hakyll · git.iko.soy

git.iko.soy/hakyll

Parallel version bump.

commita180016488d0fed843f525db824dc0c24cde90ca authorJasper Van der Jeugt <jaspervdj@gmail.com> dateThu 14 Jan 2010, 20:59 (17 years ago) parent4bc34b8

3 files changed+6−6

compare with master

unifiedsplit

hakyll.cabal+2−2 src/Text/Hakyll/Page.hs+2−2 src/Text/Hakyll/Render/Internal.hs+2−2

hakyll.cabal+2−2

@@ -1,5 +1,5 @@

11Name: hakyll

2−Version: 1.0

2+Version: 1.0.1

44Synopsis: A simple static site generator library.

55Description:

@@ -34,7 +34,7 @@ library

3434 mtl >= 1.1,

3535 old-locale >= 1,

3636 time >= 1,

37− parallel >= 1

37+ parallel >= 2

3838 exposed-modules: Text.Hakyll

3939 Text.Hakyll.Hakyll

4040 Text.Hakyll.Render

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

@@ -10,7 +10,7 @@ import qualified Data.Map as M

1010import qualified Data.List as L

1111import Data.Maybe (fromMaybe)

1212

13−import Control.Parallel.Strategies (rnf, ($|))

13+import Control.Parallel.Strategies (rdeepseq, ($|))

1414import Control.Monad.Reader (liftIO)

1515

1616import System.FilePath (FilePath, takeExtension)

@@ -125,7 +125,7 @@ readPage pagePath = do

125125 , ("path", pagePath)

126126 ] ++ metaData

127127

128− seq (($|) id rnf rendered) $ liftIO $ hClose handle

128+ seq (($|) id rdeepseq rendered) $ liftIO $ hClose handle

129129

130130 -- Cache if needed

131131 if getFromCache then return () else cachePage page

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

@@ -16,7 +16,7 @@ import Control.Monad (liftM)

1616import Data.List (isPrefixOf, foldl')

1717import Data.Char (isAlpha)

1818import Data.Maybe (fromMaybe)

19−import Control.Parallel.Strategies (rnf, ($|))

19+import Control.Parallel.Strategies (rdeepseq, ($|))

2020import Text.Hakyll.Renderable

2121import Text.Hakyll.Page

2222import Text.Hakyll.File

@@ -57,7 +57,7 @@ pureRenderWith manipulation template context =

5757 let contextIgnoringRoot = M.insert "root" "$root" (manipulation context)

5858 body = regularSubstitute template contextIgnoringRoot

5959 -- Force the body to be rendered.

60− in ($|) id rnf (M.insert "body" body context)

60+ in ($|) id rdeepseq (M.insert "body" body context)

6161

6262-- | A pure renderAndConcat function.

6363pureRenderAndConcatWith :: ContextManipulation