summaryrefslogtreecommitdiff
path: root/src/Hakyll/Core
diff options
context:
space:
mode:
Diffstat (limited to 'src/Hakyll/Core')
-rw-r--r--src/Hakyll/Core/CompiledItem.hs7
-rw-r--r--src/Hakyll/Core/Compiler/Internal.hs3
-rw-r--r--src/Hakyll/Core/DirectedGraph.hs4
-rw-r--r--src/Hakyll/Core/DirectedGraph/DependencySolver.hs6
-rw-r--r--src/Hakyll/Core/DirectedGraph/Internal.hs4
-rw-r--r--src/Hakyll/Core/ResourceProvider/FileResourceProvider.hs2
-rw-r--r--src/Hakyll/Core/Route.hs4
-rw-r--r--src/Hakyll/Core/Rules.hs2
-rw-r--r--src/Hakyll/Core/Run.hs5
9 files changed, 18 insertions, 19 deletions
diff --git a/src/Hakyll/Core/CompiledItem.hs b/src/Hakyll/Core/CompiledItem.hs
index a803971..fe6730b 100644
--- a/src/Hakyll/Core/CompiledItem.hs
+++ b/src/Hakyll/Core/CompiledItem.hs
@@ -11,6 +11,7 @@ module Hakyll.Core.CompiledItem
import Data.Binary (Binary)
import Data.Typeable (Typeable, cast)
+import Data.Maybe (fromMaybe)
import Hakyll.Core.Writable
@@ -34,6 +35,6 @@ compiledItem = CompiledItem
unCompiledItem :: (Binary a, Typeable a, Writable a)
=> CompiledItem
-> a
-unCompiledItem (CompiledItem x) = case cast x of
- Just x' -> x'
- Nothing -> error "Hakyll.Core.CompiledItem.unCompiledItem: Unsupported type"
+unCompiledItem (CompiledItem x) = fromMaybe error' $ cast x
+ where
+ error' = error "Hakyll.Core.CompiledItem.unCompiledItem: Unsupported type"
diff --git a/src/Hakyll/Core/Compiler/Internal.hs b/src/Hakyll/Core/Compiler/Internal.hs
index 938d81a..5ae2f5b 100644
--- a/src/Hakyll/Core/Compiler/Internal.hs
+++ b/src/Hakyll/Core/Compiler/Internal.hs
@@ -92,8 +92,7 @@ runCompilerJob compiler identifier provider route store modified =
runCompilerDependencies :: Compiler () a
-> ResourceProvider
-> Dependencies
-runCompilerDependencies compiler provider =
- runReader (compilerDependencies compiler) provider
+runCompilerDependencies compiler = runReader (compilerDependencies compiler)
fromJob :: (a -> CompilerM b)
-> Compiler a b
diff --git a/src/Hakyll/Core/DirectedGraph.hs b/src/Hakyll/Core/DirectedGraph.hs
index 66905f7..a81868e 100644
--- a/src/Hakyll/Core/DirectedGraph.hs
+++ b/src/Hakyll/Core/DirectedGraph.hs
@@ -65,12 +65,12 @@ reachableNodes set graph = reachable (setNeighbours set) set
sanitize' = S.filter (`S.notMember` visited)
neighbours' = setNeighbours (sanitize' next)
- setNeighbours = S.unions . map (flip neighbours graph) . S.toList
+ setNeighbours = S.unions . map (`neighbours` graph) . S.toList
-- | Remove all dangling pointers, i.e. references to notes that do
-- not actually exist in the graph.
--
sanitize :: Ord a => DirectedGraph a -> DirectedGraph a
-sanitize (DirectedGraph graph) = DirectedGraph $ M.map sanitize' $ graph
+sanitize (DirectedGraph graph) = DirectedGraph $ M.map sanitize' graph
where
sanitize' (Node t n) = Node t $ S.filter (`M.member` graph) n
diff --git a/src/Hakyll/Core/DirectedGraph/DependencySolver.hs b/src/Hakyll/Core/DirectedGraph/DependencySolver.hs
index 214211b..54826ff 100644
--- a/src/Hakyll/Core/DirectedGraph/DependencySolver.hs
+++ b/src/Hakyll/Core/DirectedGraph/DependencySolver.hs
@@ -10,7 +10,7 @@ module Hakyll.Core.DirectedGraph.DependencySolver
import Prelude
import qualified Prelude as P
import Data.Set (Set)
-import Data.Maybe (catMaybes)
+import Data.Maybe (mapMaybe)
import qualified Data.Map as M
import qualified Data.Set as S
@@ -48,7 +48,7 @@ order temp stack set graph@(DirectedGraph graph')
-- Check which dependencies are still in the graph
let tag = nodeTag node
deps = S.toList $ nodeNeighbours node
- unsatisfied = catMaybes $ map (flip M.lookup graph') deps
+ unsatisfied = mapMaybe (`M.lookup` graph') deps
in case unsatisfied of
-- All dependencies for node are satisfied, we can return it and
@@ -58,7 +58,7 @@ order temp stack set graph@(DirectedGraph graph')
-- There is at least one dependency left. We need to solve that
-- one first...
- (dep : _) -> if (nodeTag dep) `S.member` set
+ (dep : _) -> if nodeTag dep `S.member` set
-- The dependency is already in our stack - cycle detected!
then cycleError
-- Continue with the dependency
diff --git a/src/Hakyll/Core/DirectedGraph/Internal.hs b/src/Hakyll/Core/DirectedGraph/Internal.hs
index bc9cd92..5b02ad6 100644
--- a/src/Hakyll/Core/DirectedGraph/Internal.hs
+++ b/src/Hakyll/Core/DirectedGraph/Internal.hs
@@ -16,8 +16,8 @@ import qualified Data.Set as S
-- | A node in the directed graph
--
data Node a = Node
- { nodeTag :: a -- ^ Tag identifying the node
- , nodeNeighbours :: (Set a) -- ^ Edges starting at this node
+ { nodeTag :: a -- ^ Tag identifying the node
+ , nodeNeighbours :: Set a -- ^ Edges starting at this node
} deriving (Show)
-- | Append two nodes. Useful for joining graphs.
diff --git a/src/Hakyll/Core/ResourceProvider/FileResourceProvider.hs b/src/Hakyll/Core/ResourceProvider/FileResourceProvider.hs
index 72d38be..a2376c2 100644
--- a/src/Hakyll/Core/ResourceProvider/FileResourceProvider.hs
+++ b/src/Hakyll/Core/ResourceProvider/FileResourceProvider.hs
@@ -17,7 +17,7 @@ import Hakyll.Core.Util.File
fileResourceProvider :: IO ResourceProvider
fileResourceProvider = do
list <- map parseIdentifier <$> getRecursiveContents "."
- return $ ResourceProvider
+ return ResourceProvider
{ resourceList = list
, resourceString = readFile . toFilePath
, resourceLazyByteString = LB.readFile . toFilePath
diff --git a/src/Hakyll/Core/Route.hs b/src/Hakyll/Core/Route.hs
index 195768c..f3f0b7f 100644
--- a/src/Hakyll/Core/Route.hs
+++ b/src/Hakyll/Core/Route.hs
@@ -59,8 +59,8 @@ idRoute = Route $ Just . toFilePath
-- > Just "posts/the-art-of-trolling.html"
--
setExtension :: String -> Route
-setExtension exension = Route $ fmap (flip replaceExtension exension)
- . unRoute idRoute
+setExtension extension = Route $ fmap (`replaceExtension` extension)
+ . unRoute idRoute
-- | Modify a route: apply the route if the identifier matches the given
-- pattern, fail otherwise.
diff --git a/src/Hakyll/Core/Rules.hs b/src/Hakyll/Core/Rules.hs
index ae476b7..dd0d9a6 100644
--- a/src/Hakyll/Core/Rules.hs
+++ b/src/Hakyll/Core/Rules.hs
@@ -116,7 +116,7 @@ addCompilers :: (Binary a, Typeable a, Writable a)
-- ^ Compiler generating the other compilers
-> Rules
-- ^ Resulting rules
-addCompilers identifier compiler = RulesM $ tell $ RuleSet mempty $
+addCompilers identifier compiler = RulesM $ tell $ RuleSet mempty
[(identifier, compiler >>> arr makeRule )]
where
makeRule = MetaCompileRule . map (second box)
diff --git a/src/Hakyll/Core/Run.hs b/src/Hakyll/Core/Run.hs
index 77b3fab..c81a5ff 100644
--- a/src/Hakyll/Core/Run.hs
+++ b/src/Hakyll/Core/Run.hs
@@ -16,7 +16,6 @@ import Data.Monoid (mempty, mappend)
import Data.Typeable (Typeable)
import Data.Binary (Binary)
import System.FilePath ((</>))
-import Control.Applicative ((<$>))
import Data.Set (Set)
import qualified Data.Set as S
@@ -115,7 +114,7 @@ addNewCompilers oldCompilers newCompilers = Hakyll $ do
-- Find the old graph and append the new graph to it. This forms the
-- complete graph
- completeGraph <- (mappend currentGraph) . hakyllGraph <$> get
+ completeGraph <- mappend currentGraph . hakyllGraph <$> get
liftIO $ writeDot "dependencies.dot" show completeGraph
@@ -190,6 +189,6 @@ runCompilers ((id', compiler) : compilers) = Hakyll $ do
unHakyll $ runCompilers compilers
-- Metacompiler, slightly more complicated
- MetaCompileRule newCompilers -> do
+ MetaCompileRule newCompilers ->
-- Actually I was just kidding, it's not hard at all
unHakyll $ addNewCompilers compilers newCompilers
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-03 11:19:44 +0000