b810fe3 · hakyll · git.iko.soy

git.iko.soy/hakyll

Clean warnings

commitb810fe38cf2eddb67b8fa9e56434ce5dbde4f22e authorJasper Van der Jeugt <m@jaspervdj.be> dateWed 6 Apr 2016, 17:16 (11 years ago) parente7deee7

27 files changed+52−78

compare with master

unifiedsplit

hakyll.cabal+6

@@ -165,6 +165,7 @@ Library

165165 random >= 1.0 && < 1.2,

166166 regex-base >= 0.93 && < 0.94,

167167 regex-tdfa >= 1.1 && < 1.3,

168+ resourcet >= 1.1 && < 1.2,

168169 tagsoup >= 0.13.1 && < 0.14,

169170 text >= 0.11 && < 1.3,

170171 time >= 1.4 && < 1.6,

@@ -254,6 +255,7 @@ Test-suite hakyll-tests

254255 random >= 1.0 && < 1.2,

255256 regex-base >= 0.93 && < 0.94,

256257 regex-tdfa >= 1.1 && < 1.3,

258+ resourcet >= 1.1 && < 1.2,

257259 tagsoup >= 0.13.1 && < 0.14,

258260 text >= 0.11 && < 1.3,

259261 time >= 1.4 && < 1.6,

@@ -299,3 +301,7 @@ Executable hakyll-init

299301 base >= 4 && < 5,

300302 directory >= 1.0 && < 1.3,

301303 filepath >= 1.0 && < 1.5

304+

305+ Other-modules:

306+ Hakyll.Core.Util.File

307+ Paths_hakyll

src/Hakyll/Check.hs+32−29

@@ -8,42 +8,44 @@ module Hakyll.Check

1010--------------------------------------------------------------------------------

11−import Control.Applicative ((<$>))

12−import Control.Monad (forM_)

13−import Control.Monad.Reader (ask)

14−import Control.Monad.RWS (RWST, runRWST)

15−import Control.Monad.Trans (liftIO)

16−import Control.Monad.Writer (tell)

17−import Data.List (isPrefixOf)

18−import Data.Monoid (Monoid (..))

19−import Data.Set (Set)

20−import qualified Data.Set as S

21−import Network.URI (unEscapeString)

22−import System.Directory (doesDirectoryExist, doesFileExist)

23−import System.Exit (ExitCode (..))

24−import System.FilePath (takeDirectory, takeExtension, (</>))

25−import qualified Text.HTML.TagSoup as TS

11+import Control.Monad (forM_)

12+import Control.Monad.Reader (ask)

13+import Control.Monad.RWS (RWST, runRWST)

14+import Control.Monad.Trans (liftIO)

15+import Control.Monad.Trans.Resource (runResourceT)

16+import Control.Monad.Writer (tell)

17+import Data.List (isPrefixOf)

18+import Data.Set (Set)

19+import qualified Data.Set as S

20+import Network.URI (unEscapeString)

21+import System.Directory (doesDirectoryExist,

22+ doesFileExist)

23+import System.Exit (ExitCode (..))

24+import System.FilePath (takeDirectory, takeExtension,

25+ (</>))

26+import qualified Text.HTML.TagSoup as TS

2627

2728

2829--------------------------------------------------------------------------------

2930#ifdef CHECK_EXTERNAL

30−import Control.Exception (AsyncException (..),

31− SomeException (..), handle, throw)

32−import Control.Monad.State (get, modify)

33−import Data.List (intercalate)

34−import Data.Typeable (cast)

35−import Data.Version (versionBranch)

36−import GHC.Exts (fromString)

37−import qualified Network.HTTP.Conduit as Http

38−import qualified Network.HTTP.Types as Http

39−import qualified Paths_hakyll as Paths_hakyll

31+import Control.Exception (AsyncException (..),

32+ SomeException (..), handle,

33+ throw)

34+import Control.Monad.State (get, modify)

35+import Data.List (intercalate)

36+import Data.Typeable (cast)

37+import Data.Version (versionBranch)

38+import GHC.Exts (fromString)

39+import qualified Network.HTTP.Conduit as Http

40+import qualified Network.HTTP.Types as Http

41+import qualified Paths_hakyll as Paths_hakyll

4042#endif

4143

4244

4345--------------------------------------------------------------------------------

4446import Hakyll.Core.Configuration

45−import Hakyll.Core.Logger (Logger)

46−import qualified Hakyll.Core.Logger as Logger

47+import Hakyll.Core.Logger (Logger)

48+import qualified Hakyll.Core.Logger as Logger

4749import Hakyll.Core.Util.File

4850import Hakyll.Web.Html

4951

@@ -196,8 +198,9 @@ checkExternalUrl url = do

196198 if not needsCheck || checked

197199 then Logger.debug logger "Already checked, skipping"

198200 else do

199− isOk <- liftIO $ handle (failure logger) $

200− Http.withManager $ \mgr -> do

201+ isOk <- liftIO $ handle (failure logger) $ do

202+ mgr <- Http.newManager Http.tlsManagerSettings

203+ runResourceT $ do

201204 request <- Http.parseUrl urlToCheck

202205 response <- Http.http (settings request) mgr

203206 let code = Http.statusCode (Http.responseStatus response)

src/Hakyll/Commands.hs−3

@@ -14,11 +14,8 @@ module Hakyll.Commands

1414

1515

1616--------------------------------------------------------------------------------

17−import Control.Applicative

1817import Control.Concurrent

19−import Control.Monad (void)

2018import System.Exit (ExitCode, exitWith)

21−import System.IO.Error (catchIOError)

2219

2320--------------------------------------------------------------------------------

2421import qualified Hakyll.Check as Check

src/Hakyll/Core/Compiler.hs−1

@@ -28,7 +28,6 @@ module Hakyll.Core.Compiler

2828

2929

3030--------------------------------------------------------------------------------

31−import Control.Applicative ((<$>))

3231import Control.Monad (when)

3332import Data.Binary (Binary)

3433import Data.ByteString.Lazy (ByteString)

src/Hakyll/Core/Compiler/Internal.hs+2−4

@@ -28,12 +28,10 @@ module Hakyll.Core.Compiler.Internal

2828

2929

3030--------------------------------------------------------------------------------

31−import Control.Applicative (Alternative (..),

32− Applicative (..), (<$>))

31+import Control.Applicative (Alternative (..))

3332import Control.Exception (SomeException, handle)

3433import Control.Monad (forM_)

35−import Control.Monad.Error (MonadError (..))

36−import Data.Monoid (Monoid (..))

34+import Control.Monad.Except (MonadError (..))

3735import Data.Set (Set)

3836import qualified Data.Set as S

3937

src/Hakyll/Core/Compiler/Require.hs−1

@@ -13,7 +13,6 @@ module Hakyll.Core.Compiler.Require

1313

1414

1515--------------------------------------------------------------------------------

16−import Control.Applicative ((<$>))

1716import Control.Monad (when)

1817import Data.Binary (Binary)

1918import qualified Data.Set as S

src/Hakyll/Core/Dependencies.hs−1

@@ -8,7 +8,6 @@ module Hakyll.Core.Dependencies

1010--------------------------------------------------------------------------------

11−import Control.Applicative ((<$>), (<*>))

1211import Control.Monad (foldM, forM_, unless, when)

1312import Control.Monad.Reader (ask)

1413import Control.Monad.RWS (RWS, runRWS)

src/Hakyll/Core/File.hs−1

@@ -11,7 +11,6 @@ module Hakyll.Core.File

1111

1212

1313--------------------------------------------------------------------------------

14−import Control.Applicative ((<$>))

1514import Data.Binary (Binary (..))

1615import Data.Typeable (Typeable)

1716import System.Directory (copyFile, doesFileExist,

src/Hakyll/Core/Identifier.hs−1

@@ -19,7 +19,6 @@ module Hakyll.Core.Identifier

1919

2020

2121--------------------------------------------------------------------------------

22−import Control.Applicative ((<$>), (<*>))

2322import Control.DeepSeq (NFData (..))

2423import Data.List (intercalate)

2524import System.FilePath (dropTrailingPathSeparator, splitPath)

src/Hakyll/Core/Identifier/Pattern.hs−2

@@ -57,13 +57,11 @@ module Hakyll.Core.Identifier.Pattern

5757

5858

5959--------------------------------------------------------------------------------

60−import Control.Applicative (pure, (<$>), (<*>))

6160import Control.Arrow ((&&&), (>>>))

6261import Control.Monad (msum)

6362import Data.Binary (Binary (..), getWord8, putWord8)

6463import Data.List (inits, isPrefixOf, tails)

6564import Data.Maybe (isJust)

66−import Data.Monoid (Monoid, mappend, mempty)

6765import Data.Set (Set)

6866import qualified Data.Set as S

6967

src/Hakyll/Core/Item.hs−2

@@ -10,10 +10,8 @@ module Hakyll.Core.Item

1010

1111

1212--------------------------------------------------------------------------------

13−import Control.Applicative ((<$>), (<*>))

1413import Data.Binary (Binary (..))

1514import Data.Foldable (Foldable (..))

16−import Data.Traversable (Traversable (..))

1715import Data.Typeable (Typeable)

1816import Prelude hiding (foldr)

1917

src/Hakyll/Core/Logger.hs−1

@@ -13,7 +13,6 @@ module Hakyll.Core.Logger

1313

1414

1515--------------------------------------------------------------------------------

16−import Control.Applicative (pure, (<$>), (<*>))

1716import Control.Concurrent (forkIO)

1817import Control.Concurrent.Chan (Chan, newChan, readChan, writeChan)

1918import Control.Concurrent.MVar (MVar, newEmptyMVar, putMVar, takeMVar)

src/Hakyll/Core/Provider/Internal.hs−2

@@ -20,7 +20,6 @@ module Hakyll.Core.Provider.Internal

2020

2121

2222--------------------------------------------------------------------------------

23−import Control.Applicative ((<$>), (<*>))

2423import Control.DeepSeq (NFData (..), deepseq)

2524import Control.Monad (forM)

2625import Data.Binary (Binary (..))

@@ -28,7 +27,6 @@ import qualified Data.ByteString.Lazy as BL

2827import Data.Map (Map)

2928import qualified Data.Map as M

3029import Data.Maybe (fromMaybe)

31−import Data.Monoid (mempty)

3230import Data.Set (Set)

3331import qualified Data.Set as S

3432import Data.Time (Day (..), UTCTime (..))

src/Hakyll/Core/Provider/Metadata.hs−5

@@ -11,13 +11,10 @@ module Hakyll.Core.Provider.Metadata

1111

1212

1313--------------------------------------------------------------------------------

14−import Control.Applicative

1514import Control.Arrow (second)

1615import Control.Exception (Exception, throwIO)

1716import Control.Monad (guard)

1817import qualified Data.ByteString.Char8 as BC

19−import qualified Data.HashMap.Strict as HMS

20−import Data.List (intercalate)

2118import Data.List.Extended (breakWhen)

2219import qualified Data.Map as M

2320import Data.Maybe (fromMaybe)

@@ -28,8 +25,6 @@ import qualified Data.Yaml as Yaml

2825import Hakyll.Core.Identifier

2926import Hakyll.Core.Metadata

3027import Hakyll.Core.Provider.Internal

31−import Hakyll.Core.Util.Parser

32−import Hakyll.Core.Util.String

3328import System.IO as IO

3429

3530

src/Hakyll/Core/Rules.hs−2

@@ -33,13 +33,11 @@ module Hakyll.Core.Rules

3333

3434

3535--------------------------------------------------------------------------------

36−import Control.Applicative ((<$>))

3736import Control.Monad.Reader (ask, local)

3837import Control.Monad.State (get, modify, put)

3938import Control.Monad.Trans (liftIO)

4039import Control.Monad.Writer (censor, tell)

4140import Data.Maybe (fromMaybe)

42−import Data.Monoid (mempty)

4341import qualified Data.Set as S

4442

4543

src/Hakyll/Core/Rules/Internal.hs−2

@@ -12,12 +12,10 @@ module Hakyll.Core.Rules.Internal

1212

1313

1414--------------------------------------------------------------------------------

15−import Control.Applicative (Applicative, (<$>))

1615import Control.Monad.Reader (ask)

1716import Control.Monad.RWS (RWST, runRWST)

1817import Control.Monad.Trans (liftIO)

1918import qualified Data.Map as M

20−import Data.Monoid (Monoid, mappend, mempty)

2119import Data.Set (Set)

2220

2321

src/Hakyll/Core/Runtime.hs+3−3

@@ -6,7 +6,7 @@ module Hakyll.Core.Runtime

77--------------------------------------------------------------------------------

88import Control.Monad (unless)

9−import Control.Monad.Error (ErrorT, runErrorT, throwError)

9+import Control.Monad.Except (ExceptT, runExceptT, throwError)

1010import Control.Monad.Reader (ask)

1111import Control.Monad.RWS (RWST, runRWST)

1212import Control.Monad.State (get, modify)

@@ -75,7 +75,7 @@ run config logger rules = do

7575 }

7676

7777 -- Run the program and fetch the resulting state

78− result <- runErrorT $ runRWST build read' state

78+ result <- runExceptT $ runRWST build read' state

7979 case result of

8080 Left e -> do

8181 Logger.error logger e

@@ -115,7 +115,7 @@ data RuntimeState = RuntimeState

115115

116116

117117--------------------------------------------------------------------------------

118−type Runtime a = RWST RuntimeRead () RuntimeState (ErrorT String IO) a

118+type Runtime a = RWST RuntimeRead () RuntimeState (ExceptT String IO) a

119119

120120

121121--------------------------------------------------------------------------------

src/Hakyll/Core/Store.hs−1

@@ -16,7 +16,6 @@ module Hakyll.Core.Store

1616

1717

1818--------------------------------------------------------------------------------

19−import Control.Applicative ((<$>))

2019import Control.Exception (IOException, handle)

2120import qualified Crypto.Hash.MD5 as MD5

2221import Data.Binary (Binary, decode, encodeFile)

src/Hakyll/Core/UnixFilter.hs−1

@@ -16,7 +16,6 @@ import Control.Monad (forM_)

1616import Data.ByteString.Lazy (ByteString)

1717import qualified Data.ByteString.Lazy as LB

1818import Data.IORef (newIORef, readIORef, writeIORef)

19−import Data.Monoid (Monoid, mempty)

2019import System.Exit (ExitCode (..))

2120import System.IO (Handle, hClose, hFlush, hGetContents,

2221 hPutStr, hSetEncoding, localeEncoding)

src/Hakyll/Core/Util/File.hs−1

@@ -8,7 +8,6 @@ module Hakyll.Core.Util.File

1010--------------------------------------------------------------------------------

11−import Control.Applicative ((<$>))

1211import Control.Monad (filterM, forM, when)

1312import System.Directory (createDirectoryIfMissing,

1413 doesDirectoryExist, getDirectoryContents,

src/Hakyll/Core/Util/Parser.hs+1−1

@@ -7,7 +7,7 @@ module Hakyll.Core.Util.Parser

99--------------------------------------------------------------------------------

10−import Control.Applicative ((<$>), (<*>), (<|>))

10+import Control.Applicative ((<|>))

1111import Control.Monad (mzero)

1212import qualified Text.Parsec as P

1313import Text.Parsec.String (Parser)

src/Hakyll/Web/CompressCss.hs−1

@@ -8,7 +8,6 @@ module Hakyll.Web.CompressCss

1010--------------------------------------------------------------------------------

11−import Control.Applicative ((<$>))

1211import Data.Char (isSpace)

1312import Data.List (isPrefixOf)

1413

src/Hakyll/Web/Feed.hs−1

@@ -25,7 +25,6 @@ module Hakyll.Web.Feed

2525

2626--------------------------------------------------------------------------------

2727import Control.Monad ((<=<))

28−import Data.Monoid (mconcat)

2928

3029

3130--------------------------------------------------------------------------------

src/Hakyll/Web/Paginate.hs−1

@@ -13,7 +13,6 @@ module Hakyll.Web.Paginate

1313--------------------------------------------------------------------------------

1414import Control.Monad (forM_)

1515import qualified Data.Map as M

16−import Data.Monoid (mconcat)

1716import qualified Data.Set as S

1817

1918

src/Hakyll/Web/Pandoc.hs−2

@@ -22,9 +22,7 @@ module Hakyll.Web.Pandoc

2222

2323

2424--------------------------------------------------------------------------------

25−import Control.Applicative ((<$>))

2625import qualified Data.Set as S

27−import Data.Traversable (traverse)

2826import Text.Pandoc

2927import Text.Pandoc.Error (PandocError (..))

3028

src/Hakyll/Web/Template.hs+7−8

@@ -54,7 +54,7 @@

5454-- The @for@ macro is used for enumerating 'Context' elements that are

5555-- lists, i.e. constructed using the 'listField' function. Assume that

5656-- in a context we have an element @listField \"key\" c itms@. Then

57−-- the snippet

57+-- the snippet

5858--

5959-- > $for(key)$

6060-- > $x$

@@ -70,21 +70,21 @@

7070--

7171-- > listField "things" (field "thing" (return . itemBody))

7272-- > (sequence [makeItem "fruits", makeItem "vegetables"])

73−--

73+--

7474-- and a template

7575--

7676-- > I like

7777-- > $for(things)$

78−-- > fresh $thing$$sep$, and

78+-- > fresh $thing$$sep$, and

7979-- > $endfor$

8080--

8181-- the resulting page would look like

8282--

8383-- > <p>

8484-- > I like

85−-- >

86−-- > fresh fruits, and

87−-- >

85+-- >

86+-- > fresh fruits, and

87+-- >

8888-- > fresh vegetables

8989-- > </p>

9090--

@@ -129,9 +129,8 @@ module Hakyll.Web.Template

129129

130130--------------------------------------------------------------------------------

131131import Control.Monad (liftM)

132−import Control.Monad.Error (MonadError (..))

132+import Control.Monad.Except (MonadError (..))

133133import Data.List (intercalate)

134−import Data.Monoid (mappend)

135134import Prelude hiding (id)

136135

137136

src/Hakyll/Web/Template/Internal.hs+1−1

@@ -12,7 +12,7 @@ module Hakyll.Web.Template.Internal

1212

1313

1414--------------------------------------------------------------------------------

15−import Control.Applicative (pure, (<$), (<$>), (<*>), (<|>))

15+import Control.Applicative ((<|>))

1616import Control.Monad (void)

1717import Data.Binary (Binary, get, getWord8, put, putWord8)

1818import Data.Typeable (Typeable)