From 20a95b4d24824b0e860da968bc7b3152d4e1a1d2 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 24 Oct 2014 10:49:59 +0300 Subject: [PATCH] Fix warnings --- Handler/Haddock.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Handler/Haddock.hs b/Handler/Haddock.hs index 23cdcb5..f34e7c9 100644 --- a/Handler/Haddock.hs +++ b/Handler/Haddock.hs @@ -6,7 +6,7 @@ import Filesystem (removeTree, isDirectory, createTree, isFile, rename, removeFi import Control.Concurrent (forkIO) import Control.Concurrent.Chan import System.IO.Temp (withSystemTempFile, withTempFile) -import Control.Exception (mask) +import Control.Exception (mask, mask_) import System.Process (createProcess, proc, cwd, waitForProcess) import System.Exit (ExitCode (ExitSuccess)) import Network.Mime (defaultMimeLookup) @@ -95,7 +95,7 @@ createCompressor -> IO (IO ()) -- ^ action to kick off compressor again createCompressor dirs = do baton <- newMVar () - mask $ \restore -> void $ forkIO $ forever $ do + mask_ $ void $ forkIO $ forever $ do takeMVar baton runResourceT $ goDir (dirRawRoot dirs) return $ void $ tryPutMVar baton () @@ -159,9 +159,11 @@ mkDirs dir = Dirs , dirCacheRoot = dir "cachedir" } +dirGzIdent, dirRawIdent :: Dirs -> PackageSetIdent -> FilePath dirGzIdent dirs ident = dirGzRoot dirs fpFromText (toPathPiece ident) dirRawIdent dirs ident = dirRawRoot dirs fpFromText (toPathPiece ident) +dirGzFp, dirRawFp :: Dirs -> PackageSetIdent -> [Text] -> FilePath dirGzFp dirs ident rest = dirGzIdent dirs ident mconcat (map fpFromText rest) dirRawFp dirs ident rest = dirRawIdent dirs ident mconcat (map fpFromText rest)