From 6bb94ac3fa652da5c479f262b92d3f54d4f2cc79 Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Sun, 29 May 2011 12:30:33 +0200 Subject: Relax Rules to RulesM a in most places --- src/Hakyll/Core/Rules/Internal.hs | 2 +- src/Hakyll/Core/Run.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Hakyll/Core') diff --git a/src/Hakyll/Core/Rules/Internal.hs b/src/Hakyll/Core/Rules/Internal.hs index 5a1ab8e..fd13f7a 100644 --- a/src/Hakyll/Core/Rules/Internal.hs +++ b/src/Hakyll/Core/Rules/Internal.hs @@ -80,7 +80,7 @@ type Rules = RulesM () -- | Run a Rules monad, resulting in a 'RuleSet' -- -runRules :: Rules -> ResourceProvider -> RuleSet +runRules :: RulesM a -> ResourceProvider -> RuleSet runRules rules provider = nubCompilers $ evalState (execWriterT $ runReaderT (unRulesM rules) env) state where diff --git a/src/Hakyll/Core/Run.hs b/src/Hakyll/Core/Run.hs index 9b27cf3..88cc160 100644 --- a/src/Hakyll/Core/Run.hs +++ b/src/Hakyll/Core/Run.hs @@ -35,7 +35,7 @@ import Hakyll.Core.Logger -- | Run all rules needed, return the rule set used -- -run :: HakyllConfiguration -> Rules -> IO RuleSet +run :: HakyllConfiguration -> RulesM a -> IO RuleSet run configuration rules = do logger <- makeLogger putStrLn -- cgit v1.2.3