f3c8303 · hakyll · git.iko.soy

git.iko.soy/hakyll

Parallel version bump.

Conflicts: src/Text/Hakyll/Page.hs

commitf3c83030b9b0e186f283523af08ca886de33783c authorJasper Van der Jeugt <jaspervdj@gmail.com> dateThu 14 Jan 2010, 21:01 (17 years ago) parent332f2f9

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.Render

4040 Text.Hakyll.Renderable

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, ($|))

1414

1515import System.FilePath (FilePath, takeExtension)

1616import System.IO

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

123123 , ("path", pagePath)

124124 ] ++ metaData

125125

126− seq (($|) id rnf rendered) $ hClose handle

126+ seq (($|) id rdeepseq rendered) $ hClose handle

127127

128128 -- Cache if needed

129129 if getFromCache then return () else cachePage page

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

@@ -14,7 +14,7 @@ import Text.Hakyll.Context (Context, ContextManipulation)

1414import Data.List (isPrefixOf, foldl')

1515import Data.Char (isAlpha)

1616import Data.Maybe (fromMaybe)

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

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

1818import Text.Hakyll.Renderable

1919import Text.Hakyll.Page

2020import Text.Hakyll.File

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

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

5555 body = regularSubstitute template contextIgnoringRoot

5656 -- Force the body to be rendered.

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

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

5858

5959-- | A pure renderAndConcat function.

6060pureRenderAndConcatWith :: ContextManipulation