e6c7fcc · typeable/pandoc

git.iko.soy/typeable/pandoc

Fixed some compiler warnings in tests.

commite6c7fcc59856893a4947925f0dddc3a44b74a48a authorJohn MacFarlane <jgm@berkeley.edu> dateTue 2 Feb 2021, 21:09 (6 years ago) parent6f79042

3 files changed+3−14

compare with master

unifiedsplit

test/Tests/Command.hs+2−3 test/Tests/Helpers.hs−3 test/Tests/Old.hs+1−8

test/Tests/Command.hs+2−3

@@ -19,12 +19,11 @@ import Data.Algorithm.Diff

1919import System.Environment.Executable (getExecutablePath)

2020import qualified Data.ByteString as BS

2121import qualified Data.Text as T

22−import Data.List (isSuffixOf, intercalate)

23−import Data.Maybe (catMaybes)

22+import Data.List (isSuffixOf)

2423import System.Directory

2524import qualified System.Environment as Env

2625import System.Exit

27−import System.FilePath (joinPath, splitDirectories, takeDirectory, (</>))

26+import System.FilePath (takeDirectory, (</>))

2827import System.IO (hPutStr, stderr)

2928import System.IO.Unsafe (unsafePerformIO)

3029import System.Process

test/Tests/Helpers.hs−3

@@ -26,10 +26,7 @@ import Prelude

2626import Data.Algorithm.Diff

2727import qualified Data.Map as M

2828import Data.Text (Text, unpack)

29−import System.Directory

30−import System.Environment.Executable (getExecutablePath)

3129import System.Exit

32−import System.FilePath

3330import Test.Tasty

3431import Test.Tasty.HUnit

3532import Text.Pandoc.Builder (Blocks, Inlines, doc, plain)

test/Tests/Old.hs+1−8

@@ -15,10 +15,8 @@ module Tests.Old (tests) where

1515

1616import Prelude

1717import Data.Algorithm.Diff

18−import Data.List (intercalate)

19−import Data.Maybe (catMaybes)

2018import System.Exit

21−import System.FilePath (joinPath, splitDirectories, (<.>), (</>))

19+import System.FilePath ((<.>), (</>))

2220import qualified System.Environment as Env

2321import System.Environment.Executable (getExecutablePath)

2422import Text.Pandoc.Process (pipeProcess)

@@ -353,8 +351,3 @@ compareValues norm options expected actual = do

353351 "\n--- " ++ norm ++

354352 "\n+++ " ++ cmd ++ "\n" ++

355353 showDiff (1,1) diff ++ dash

356−

357−findDynlibDir :: [FilePath] -> Maybe FilePath

358−findDynlibDir [] = Nothing

359−findDynlibDir ("build":xs) = Just $ joinPath (reverse xs) </> "build"

360−findDynlibDir (_:xs) = findDynlibDir xs