Removes superfluous functions, added some logging.

2 files changed, 5 insertions, 29 deletions

diff --git a/src/Text/Hakyll/Internal/Render.hs b/src/Text/Hakyll/Internal/Render.hs
index 0fae8a7..739db7a 100644
--- a/src/Text/Hakyll/Internal/Render.hs
+++ b/src/Text/Hakyll/Internal/Render.hs
@@ -4,15 +4,13 @@ module Text.Hakyll.Internal.Render
     , regularSubstitute
     , finalSubstitute
     , pureRenderWith
-    , pureRenderAndConcatWith
-    , pureRenderChainWith
     , writePage
     ) where
 
 import qualified Data.Map as M
 import Control.Monad.Reader (liftIO)
-import Data.List (foldl')
 import Data.Maybe (fromMaybe)
+import System.IO (hPutStrLn, stderr)
 
 import Text.Hakyll.Context (Context, ContextManipulation)
 import Text.Hakyll.File
@@ -32,26 +30,6 @@ pureRenderWith manipulation template context =
         body = regularSubstitute template contextIgnoringRoot
     in M.insert "body" body context
 
--- | A pure renderAndConcat function.
-pureRenderAndConcatWith :: ContextManipulation -- ^ Manipulation to apply.
-                        -> [Template] -- ^ Templates to use.
-                        -> [Context] -- ^ Different renderables.
-                        -> String
-pureRenderAndConcatWith manipulation templates =
-    concatMap renderAndConcat
-  where
-    renderAndConcat = fromMaybe "" . M.lookup "body"
-                    . pureRenderChainWith manipulation templates
-
--- | A pure renderChain function.
-pureRenderChainWith :: ContextManipulation
-                    -> [Template]
-                    -> Context
-                    -> Context
-pureRenderChainWith manipulation templates context =
-    let initial = manipulation context
-    in foldl' (flip $ pureRenderWith id) initial templates
-
 -- | Write a page to the site destination. Final action after render
 --   chains and such.
 writePage :: RenderAction Context ()
@@ -64,4 +42,6 @@ writePage = createRenderAction $ \initialContext -> do
     destination <- toDestination url
     makeDirectories destination
     -- Substitute $root here, just before writing.
-    liftIO $ writeFile destination $ finalSubstitute (fromString body) context
+    liftIO $ do
+        writeFile destination $ finalSubstitute (fromString body) context
+        hPutStrLn stderr $ "Writing " ++ destination
diff --git a/src/Text/Hakyll/RenderAction.hs b/src/Text/Hakyll/RenderAction.hs
index 28c8e09..9fb9477 100644
--- a/src/Text/Hakyll/RenderAction.hs
+++ b/src/Text/Hakyll/RenderAction.hs
@@ -21,11 +21,7 @@ data RenderAction a b = RenderAction
     }
 
 createRenderAction :: (a -> Hakyll b) -> RenderAction a b
-createRenderAction f = RenderAction
-    { actionDependencies = []
-    , actionUrl          = Nothing
-    , actionFunction     = f
-    }
+createRenderAction f = id { actionFunction = f }
 
 createSimpleRenderAction :: Hakyll b -> RenderAction () b
 createSimpleRenderAction = createRenderAction . const