Clean warnings
This commit is contained in:
parent
e7deee7e7a
commit
b810fe38cf
27 changed files with 52 additions and 78 deletions
|
@ -165,6 +165,7 @@ Library
|
|||
random >= 1.0 && < 1.2,
|
||||
regex-base >= 0.93 && < 0.94,
|
||||
regex-tdfa >= 1.1 && < 1.3,
|
||||
resourcet >= 1.1 && < 1.2,
|
||||
tagsoup >= 0.13.1 && < 0.14,
|
||||
text >= 0.11 && < 1.3,
|
||||
time >= 1.4 && < 1.6,
|
||||
|
@ -254,6 +255,7 @@ Test-suite hakyll-tests
|
|||
random >= 1.0 && < 1.2,
|
||||
regex-base >= 0.93 && < 0.94,
|
||||
regex-tdfa >= 1.1 && < 1.3,
|
||||
resourcet >= 1.1 && < 1.2,
|
||||
tagsoup >= 0.13.1 && < 0.14,
|
||||
text >= 0.11 && < 1.3,
|
||||
time >= 1.4 && < 1.6,
|
||||
|
@ -299,3 +301,7 @@ Executable hakyll-init
|
|||
base >= 4 && < 5,
|
||||
directory >= 1.0 && < 1.3,
|
||||
filepath >= 1.0 && < 1.5
|
||||
|
||||
Other-modules:
|
||||
Hakyll.Core.Util.File
|
||||
Paths_hakyll
|
||||
|
|
|
@ -8,27 +8,29 @@ module Hakyll.Check
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative ((<$>))
|
||||
import Control.Monad (forM_)
|
||||
import Control.Monad.Reader (ask)
|
||||
import Control.Monad.RWS (RWST, runRWST)
|
||||
import Control.Monad.Trans (liftIO)
|
||||
import Control.Monad.Trans.Resource (runResourceT)
|
||||
import Control.Monad.Writer (tell)
|
||||
import Data.List (isPrefixOf)
|
||||
import Data.Monoid (Monoid (..))
|
||||
import Data.Set (Set)
|
||||
import qualified Data.Set as S
|
||||
import Network.URI (unEscapeString)
|
||||
import System.Directory (doesDirectoryExist, doesFileExist)
|
||||
import System.Directory (doesDirectoryExist,
|
||||
doesFileExist)
|
||||
import System.Exit (ExitCode (..))
|
||||
import System.FilePath (takeDirectory, takeExtension, (</>))
|
||||
import System.FilePath (takeDirectory, takeExtension,
|
||||
(</>))
|
||||
import qualified Text.HTML.TagSoup as TS
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
#ifdef CHECK_EXTERNAL
|
||||
import Control.Exception (AsyncException (..),
|
||||
SomeException (..), handle, throw)
|
||||
SomeException (..), handle,
|
||||
throw)
|
||||
import Control.Monad.State (get, modify)
|
||||
import Data.List (intercalate)
|
||||
import Data.Typeable (cast)
|
||||
|
@ -196,8 +198,9 @@ checkExternalUrl url = do
|
|||
if not needsCheck || checked
|
||||
then Logger.debug logger "Already checked, skipping"
|
||||
else do
|
||||
isOk <- liftIO $ handle (failure logger) $
|
||||
Http.withManager $ \mgr -> do
|
||||
isOk <- liftIO $ handle (failure logger) $ do
|
||||
mgr <- Http.newManager Http.tlsManagerSettings
|
||||
runResourceT $ do
|
||||
request <- Http.parseUrl urlToCheck
|
||||
response <- Http.http (settings request) mgr
|
||||
let code = Http.statusCode (Http.responseStatus response)
|
||||
|
|
|
@ -14,11 +14,8 @@ module Hakyll.Commands
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative
|
||||
import Control.Concurrent
|
||||
import Control.Monad (void)
|
||||
import System.Exit (ExitCode, exitWith)
|
||||
import System.IO.Error (catchIOError)
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import qualified Hakyll.Check as Check
|
||||
|
|
|
@ -28,7 +28,6 @@ module Hakyll.Core.Compiler
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative ((<$>))
|
||||
import Control.Monad (when)
|
||||
import Data.Binary (Binary)
|
||||
import Data.ByteString.Lazy (ByteString)
|
||||
|
|
|
@ -28,12 +28,10 @@ module Hakyll.Core.Compiler.Internal
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative (Alternative (..),
|
||||
Applicative (..), (<$>))
|
||||
import Control.Applicative (Alternative (..))
|
||||
import Control.Exception (SomeException, handle)
|
||||
import Control.Monad (forM_)
|
||||
import Control.Monad.Error (MonadError (..))
|
||||
import Data.Monoid (Monoid (..))
|
||||
import Control.Monad.Except (MonadError (..))
|
||||
import Data.Set (Set)
|
||||
import qualified Data.Set as S
|
||||
|
||||
|
|
|
@ -13,7 +13,6 @@ module Hakyll.Core.Compiler.Require
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative ((<$>))
|
||||
import Control.Monad (when)
|
||||
import Data.Binary (Binary)
|
||||
import qualified Data.Set as S
|
||||
|
|
|
@ -8,7 +8,6 @@ module Hakyll.Core.Dependencies
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative ((<$>), (<*>))
|
||||
import Control.Monad (foldM, forM_, unless, when)
|
||||
import Control.Monad.Reader (ask)
|
||||
import Control.Monad.RWS (RWS, runRWS)
|
||||
|
|
|
@ -11,7 +11,6 @@ module Hakyll.Core.File
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative ((<$>))
|
||||
import Data.Binary (Binary (..))
|
||||
import Data.Typeable (Typeable)
|
||||
import System.Directory (copyFile, doesFileExist,
|
||||
|
|
|
@ -19,7 +19,6 @@ module Hakyll.Core.Identifier
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative ((<$>), (<*>))
|
||||
import Control.DeepSeq (NFData (..))
|
||||
import Data.List (intercalate)
|
||||
import System.FilePath (dropTrailingPathSeparator, splitPath)
|
||||
|
|
|
@ -57,13 +57,11 @@ module Hakyll.Core.Identifier.Pattern
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative (pure, (<$>), (<*>))
|
||||
import Control.Arrow ((&&&), (>>>))
|
||||
import Control.Monad (msum)
|
||||
import Data.Binary (Binary (..), getWord8, putWord8)
|
||||
import Data.List (inits, isPrefixOf, tails)
|
||||
import Data.Maybe (isJust)
|
||||
import Data.Monoid (Monoid, mappend, mempty)
|
||||
import Data.Set (Set)
|
||||
import qualified Data.Set as S
|
||||
|
||||
|
|
|
@ -10,10 +10,8 @@ module Hakyll.Core.Item
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative ((<$>), (<*>))
|
||||
import Data.Binary (Binary (..))
|
||||
import Data.Foldable (Foldable (..))
|
||||
import Data.Traversable (Traversable (..))
|
||||
import Data.Typeable (Typeable)
|
||||
import Prelude hiding (foldr)
|
||||
|
||||
|
|
|
@ -13,7 +13,6 @@ module Hakyll.Core.Logger
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative (pure, (<$>), (<*>))
|
||||
import Control.Concurrent (forkIO)
|
||||
import Control.Concurrent.Chan (Chan, newChan, readChan, writeChan)
|
||||
import Control.Concurrent.MVar (MVar, newEmptyMVar, putMVar, takeMVar)
|
||||
|
|
|
@ -20,7 +20,6 @@ module Hakyll.Core.Provider.Internal
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative ((<$>), (<*>))
|
||||
import Control.DeepSeq (NFData (..), deepseq)
|
||||
import Control.Monad (forM)
|
||||
import Data.Binary (Binary (..))
|
||||
|
@ -28,7 +27,6 @@ import qualified Data.ByteString.Lazy as BL
|
|||
import Data.Map (Map)
|
||||
import qualified Data.Map as M
|
||||
import Data.Maybe (fromMaybe)
|
||||
import Data.Monoid (mempty)
|
||||
import Data.Set (Set)
|
||||
import qualified Data.Set as S
|
||||
import Data.Time (Day (..), UTCTime (..))
|
||||
|
|
|
@ -11,13 +11,10 @@ module Hakyll.Core.Provider.Metadata
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative
|
||||
import Control.Arrow (second)
|
||||
import Control.Exception (Exception, throwIO)
|
||||
import Control.Monad (guard)
|
||||
import qualified Data.ByteString.Char8 as BC
|
||||
import qualified Data.HashMap.Strict as HMS
|
||||
import Data.List (intercalate)
|
||||
import Data.List.Extended (breakWhen)
|
||||
import qualified Data.Map as M
|
||||
import Data.Maybe (fromMaybe)
|
||||
|
@ -28,8 +25,6 @@ import qualified Data.Yaml as Yaml
|
|||
import Hakyll.Core.Identifier
|
||||
import Hakyll.Core.Metadata
|
||||
import Hakyll.Core.Provider.Internal
|
||||
import Hakyll.Core.Util.Parser
|
||||
import Hakyll.Core.Util.String
|
||||
import System.IO as IO
|
||||
|
||||
|
||||
|
|
|
@ -33,13 +33,11 @@ module Hakyll.Core.Rules
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative ((<$>))
|
||||
import Control.Monad.Reader (ask, local)
|
||||
import Control.Monad.State (get, modify, put)
|
||||
import Control.Monad.Trans (liftIO)
|
||||
import Control.Monad.Writer (censor, tell)
|
||||
import Data.Maybe (fromMaybe)
|
||||
import Data.Monoid (mempty)
|
||||
import qualified Data.Set as S
|
||||
|
||||
|
||||
|
|
|
@ -12,12 +12,10 @@ module Hakyll.Core.Rules.Internal
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative (Applicative, (<$>))
|
||||
import Control.Monad.Reader (ask)
|
||||
import Control.Monad.RWS (RWST, runRWST)
|
||||
import Control.Monad.Trans (liftIO)
|
||||
import qualified Data.Map as M
|
||||
import Data.Monoid (Monoid, mappend, mempty)
|
||||
import Data.Set (Set)
|
||||
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ module Hakyll.Core.Runtime
|
|||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Monad (unless)
|
||||
import Control.Monad.Error (ErrorT, runErrorT, throwError)
|
||||
import Control.Monad.Except (ExceptT, runExceptT, throwError)
|
||||
import Control.Monad.Reader (ask)
|
||||
import Control.Monad.RWS (RWST, runRWST)
|
||||
import Control.Monad.State (get, modify)
|
||||
|
@ -75,7 +75,7 @@ run config logger rules = do
|
|||
}
|
||||
|
||||
-- Run the program and fetch the resulting state
|
||||
result <- runErrorT $ runRWST build read' state
|
||||
result <- runExceptT $ runRWST build read' state
|
||||
case result of
|
||||
Left e -> do
|
||||
Logger.error logger e
|
||||
|
@ -115,7 +115,7 @@ data RuntimeState = RuntimeState
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
type Runtime a = RWST RuntimeRead () RuntimeState (ErrorT String IO) a
|
||||
type Runtime a = RWST RuntimeRead () RuntimeState (ExceptT String IO) a
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
|
|
@ -16,7 +16,6 @@ module Hakyll.Core.Store
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative ((<$>))
|
||||
import Control.Exception (IOException, handle)
|
||||
import qualified Crypto.Hash.MD5 as MD5
|
||||
import Data.Binary (Binary, decode, encodeFile)
|
||||
|
|
|
@ -16,7 +16,6 @@ import Control.Monad (forM_)
|
|||
import Data.ByteString.Lazy (ByteString)
|
||||
import qualified Data.ByteString.Lazy as LB
|
||||
import Data.IORef (newIORef, readIORef, writeIORef)
|
||||
import Data.Monoid (Monoid, mempty)
|
||||
import System.Exit (ExitCode (..))
|
||||
import System.IO (Handle, hClose, hFlush, hGetContents,
|
||||
hPutStr, hSetEncoding, localeEncoding)
|
||||
|
|
|
@ -8,7 +8,6 @@ module Hakyll.Core.Util.File
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative ((<$>))
|
||||
import Control.Monad (filterM, forM, when)
|
||||
import System.Directory (createDirectoryIfMissing,
|
||||
doesDirectoryExist, getDirectoryContents,
|
||||
|
|
|
@ -7,7 +7,7 @@ module Hakyll.Core.Util.Parser
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative ((<$>), (<*>), (<|>))
|
||||
import Control.Applicative ((<|>))
|
||||
import Control.Monad (mzero)
|
||||
import qualified Text.Parsec as P
|
||||
import Text.Parsec.String (Parser)
|
||||
|
|
|
@ -8,7 +8,6 @@ module Hakyll.Web.CompressCss
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative ((<$>))
|
||||
import Data.Char (isSpace)
|
||||
import Data.List (isPrefixOf)
|
||||
|
||||
|
|
|
@ -25,7 +25,6 @@ module Hakyll.Web.Feed
|
|||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Monad ((<=<))
|
||||
import Data.Monoid (mconcat)
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
|
|
@ -13,7 +13,6 @@ module Hakyll.Web.Paginate
|
|||
--------------------------------------------------------------------------------
|
||||
import Control.Monad (forM_)
|
||||
import qualified Data.Map as M
|
||||
import Data.Monoid (mconcat)
|
||||
import qualified Data.Set as S
|
||||
|
||||
|
||||
|
|
|
@ -22,9 +22,7 @@ module Hakyll.Web.Pandoc
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative ((<$>))
|
||||
import qualified Data.Set as S
|
||||
import Data.Traversable (traverse)
|
||||
import Text.Pandoc
|
||||
import Text.Pandoc.Error (PandocError (..))
|
||||
|
||||
|
|
|
@ -129,9 +129,8 @@ module Hakyll.Web.Template
|
|||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Monad (liftM)
|
||||
import Control.Monad.Error (MonadError (..))
|
||||
import Control.Monad.Except (MonadError (..))
|
||||
import Data.List (intercalate)
|
||||
import Data.Monoid (mappend)
|
||||
import Prelude hiding (id)
|
||||
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ module Hakyll.Web.Template.Internal
|
|||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
import Control.Applicative (pure, (<$), (<$>), (<*>), (<|>))
|
||||
import Control.Applicative ((<|>))
|
||||
import Control.Monad (void)
|
||||
import Data.Binary (Binary, get, getWord8, put, putWord8)
|
||||
import Data.Typeable (Typeable)
|
||||
|
|
Loading…
Reference in a new issue