diff options
author | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2010-01-14 21:01:18 +0100 |
---|---|---|
committer | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2010-01-14 21:01:18 +0100 |
commit | f3c83030b9b0e186f283523af08ca886de33783c (patch) | |
tree | be219218e85a7e2572ae7eea92298709dbc67ae4 | |
parent | 332f2f95cdb9c72e01a55eaf46c0b08bcf37d7e9 (diff) | |
download | hakyll-f3c83030b9b0e186f283523af08ca886de33783c.tar.gz |
Parallel version bump.
Conflicts:
src/Text/Hakyll/Page.hs
-rw-r--r-- | hakyll.cabal | 4 | ||||
-rw-r--r-- | src/Text/Hakyll/Page.hs | 4 | ||||
-rw-r--r-- | src/Text/Hakyll/Render/Internal.hs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/hakyll.cabal b/hakyll.cabal index e9938f7..c1f7505 100644 --- a/hakyll.cabal +++ b/hakyll.cabal @@ -1,5 +1,5 @@ Name: hakyll -Version: 1.0 +Version: 1.0.1 Synopsis: A simple static site generator library. Description: @@ -34,7 +34,7 @@ library mtl >= 1.1, old-locale >= 1, time >= 1, - parallel >= 1 + parallel >= 2 exposed-modules: Text.Hakyll Text.Hakyll.Render Text.Hakyll.Renderable diff --git a/src/Text/Hakyll/Page.hs b/src/Text/Hakyll/Page.hs index 0b7776b..6788240 100644 --- a/src/Text/Hakyll/Page.hs +++ b/src/Text/Hakyll/Page.hs @@ -10,7 +10,7 @@ import qualified Data.Map as M import qualified Data.List as L import Data.Maybe (fromMaybe) -import Control.Parallel.Strategies (rnf, ($|)) +import Control.Parallel.Strategies (rdeepseq, ($|)) import System.FilePath (FilePath, takeExtension) import System.IO @@ -123,7 +123,7 @@ readPage pagePath = do , ("path", pagePath) ] ++ metaData - seq (($|) id rnf rendered) $ hClose handle + seq (($|) id rdeepseq rendered) $ hClose handle -- Cache if needed if getFromCache then return () else cachePage page diff --git a/src/Text/Hakyll/Render/Internal.hs b/src/Text/Hakyll/Render/Internal.hs index 3b9bfbb..8679dfb 100644 --- a/src/Text/Hakyll/Render/Internal.hs +++ b/src/Text/Hakyll/Render/Internal.hs @@ -14,7 +14,7 @@ import Text.Hakyll.Context (Context, ContextManipulation) import Data.List (isPrefixOf, foldl') import Data.Char (isAlpha) import Data.Maybe (fromMaybe) -import Control.Parallel.Strategies (rnf, ($|)) +import Control.Parallel.Strategies (rdeepseq, ($|)) import Text.Hakyll.Renderable import Text.Hakyll.Page import Text.Hakyll.File @@ -54,7 +54,7 @@ pureRenderWith manipulation template context = let contextIgnoringRoot = M.insert "root" "$root" (manipulation context) body = regularSubstitute template contextIgnoringRoot -- Force the body to be rendered. - in ($|) id rnf (M.insert "body" body context) + in ($|) id rdeepseq (M.insert "body" body context) -- | A pure renderAndConcat function. pureRenderAndConcatWith :: ContextManipulation |