diff options
| author | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2010-01-14 20:59:31 +0100 |
|---|---|---|
| committer | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2010-01-14 20:59:31 +0100 |
| commit | a180016488d0fed843f525db824dc0c24cde90ca (patch) | |
| tree | dbf811421779b6f5ac1272f668a094cebc28aa30 | |
| parent | 4bc34b8a98ffa1e7f3478a596b73c4ab12d9cb1b (diff) | |
| download | hakyll-a180016488d0fed843f525db824dc0c24cde90ca.tar.gz | |
Parallel version bump.
| -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 3e5cef0..bdba45d 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.Hakyll Text.Hakyll.Render diff --git a/src/Text/Hakyll/Page.hs b/src/Text/Hakyll/Page.hs index cbb881f..6c73ff3 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 Control.Monad.Reader (liftIO) import System.FilePath (FilePath, takeExtension) @@ -125,7 +125,7 @@ readPage pagePath = do , ("path", pagePath) ] ++ metaData - seq (($|) id rnf rendered) $ liftIO $ hClose handle + seq (($|) id rdeepseq rendered) $ liftIO $ 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 379c4c9..e6379bd 100644 --- a/src/Text/Hakyll/Render/Internal.hs +++ b/src/Text/Hakyll/Render/Internal.hs @@ -16,7 +16,7 @@ import Control.Monad (liftM) 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 @@ -57,7 +57,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 |