From 6e7a80e8a3a4ac5d77a2f520cd8ecc1aba6f32ef Mon Sep 17 00:00:00 2001
From: Jasper Van der Jeugt <m@jaspervdj.be>
Date: Sat, 24 Nov 2012 13:34:50 +0100
Subject: Simpler rules

---
 src/Hakyll/Core/Rules/Internal.hs | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

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

diff --git a/src/Hakyll/Core/Rules/Internal.hs b/src/Hakyll/Core/Rules/Internal.hs
index 249ae3b..df42d11 100644
--- a/src/Hakyll/Core/Rules/Internal.hs
+++ b/src/Hakyll/Core/Rules/Internal.hs
@@ -4,7 +4,6 @@
 {-# LANGUAGE Rank2Types                 #-}
 module Hakyll.Core.Rules.Internal
     ( RuleSet (..)
-    , RuleState (..)
     , RuleEnvironment (..)
     , Rules (..)
     , runRules
@@ -50,13 +49,6 @@ instance Monoid RuleSet where
         RuleSet (mappend r1 r2) (mappend c1 c2) (mappend s1 s2)
 
 
---------------------------------------------------------------------------------
--- | Rule state
-data RuleState = RuleState
-    { rulesNextIdentifier :: Int
-    } deriving (Show)
-
-
 --------------------------------------------------------------------------------
 -- | Rule environment
 data RuleEnvironment = RuleEnvironment
@@ -69,7 +61,7 @@ data RuleEnvironment = RuleEnvironment
 --------------------------------------------------------------------------------
 -- | The monad used to compose rules
 newtype Rules a = Rules
-    { unRules :: RWST RuleEnvironment RuleSet RuleState IO a
+    { unRules :: RWST RuleEnvironment RuleSet () IO a
     } deriving (Monad, Functor, Applicative)
 
 
@@ -88,11 +80,10 @@ instance MonadMetadata Rules where
 -- | Run a Rules monad, resulting in a 'RuleSet'
 runRules :: Rules a -> Provider -> IO RuleSet
 runRules rules provider = do
-    (_, _, ruleSet) <- runRWST (unRules rules) env state
+    (_, _, ruleSet) <- runRWST (unRules rules) env ()
     return $ nubCompilers ruleSet
   where
-    state = RuleState {rulesNextIdentifier = 0}
-    env   = RuleEnvironment
+    env = RuleEnvironment
         { rulesProvider = provider
         , rulesPattern  = mempty
         , rulesVersion  = Nothing
@@ -103,6 +94,6 @@ runRules rules provider = do
 -- | Remove duplicate compilers from the 'RuleSet'. When two compilers match an
 -- item, we prefer the first one
 nubCompilers :: RuleSet -> RuleSet
-nubCompilers set = set { rulesCompilers = nubCompilers' (rulesCompilers set) }
+nubCompilers set = set {rulesCompilers = nubCompilers' (rulesCompilers set)}
   where
     nubCompilers' = M.toList . M.fromListWith (flip const)
-- 
cgit v1.2.3