From 89272dd97f805695b3d03f9a9fb05d22f30d8a7d Mon Sep 17 00:00:00 2001
From: Jasper Van der Jeugt <m@jaspervdj.be>
Date: Tue, 13 Nov 2012 13:13:17 +0100
Subject: Simplify stuff

---
 src/Hakyll/Core/Rules/Internal.hs | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'src/Hakyll/Core/Rules')

diff --git a/src/Hakyll/Core/Rules/Internal.hs b/src/Hakyll/Core/Rules/Internal.hs
index ec3714c..360293f 100644
--- a/src/Hakyll/Core/Rules/Internal.hs
+++ b/src/Hakyll/Core/Rules/Internal.hs
@@ -6,8 +6,7 @@ module Hakyll.Core.Rules.Internal
     ( RuleSet (..)
     , RuleState (..)
     , RuleEnvironment (..)
-    , RulesM (..)
-    , Rules
+    , Rules (..)
     , runRules
     ) where
 
@@ -35,9 +34,9 @@ data RuleSet = RuleSet
     { -- | Routes used in the compilation structure
       rulesRoutes    :: Routes
     , -- | Compilation rules
-      rulesCompilers :: [(Identifier (), Compiler CompiledItem)]
+      rulesCompilers :: [(Identifier, Compiler CompiledItem)]
     , -- | A set of the actually used files
-      rulesResources :: Set (Identifier ())
+      rulesResources :: Set Identifier
     }
 
 
@@ -59,29 +58,23 @@ data RuleState = RuleState
 -- | Rule environment
 data RuleEnvironment = RuleEnvironment
     { rulesResourceProvider :: ResourceProvider
-    , rulesPattern          :: forall a. Pattern a
+    , rulesPattern          :: Pattern
     , rulesVersion          :: Maybe String
     }
 
 
 --------------------------------------------------------------------------------
 -- | The monad used to compose rules
-newtype RulesM a = RulesM
-    { unRulesM :: RWST RuleEnvironment RuleSet RuleState IO a
+newtype Rules a = Rules
+    { unRules :: RWST RuleEnvironment RuleSet RuleState IO a
     } deriving (Monad, Functor, Applicative)
 
 
---------------------------------------------------------------------------------
--- | Simplification of the RulesM type; usually, it will not return any
--- result.
-type Rules = RulesM ()
-
-
 --------------------------------------------------------------------------------
 -- | Run a Rules monad, resulting in a 'RuleSet'
-runRules :: RulesM a -> ResourceProvider -> IO RuleSet
+runRules :: Rules a -> ResourceProvider -> IO RuleSet
 runRules rules provider = do
-    (_, _, ruleSet) <- runRWST (unRulesM rules) env state
+    (_, _, ruleSet) <- runRWST (unRules rules) env state
     return $ nubCompilers ruleSet
   where
     state = RuleState {rulesNextIdentifier = 0}
-- 
cgit v1.2.3