From 44ce136f300737f678b52137e31e515ffa71eb9f Mon Sep 17 00:00:00 2001 From: Martin Kolinek Date: Wed, 24 May 2017 22:07:09 +0200 Subject: [PATCH] HLint fixes --- src/Stack/SDist.hs | 2 +- test/integration/tests/717-sdist-test/files/packagea/src/Lib.hs | 2 +- test/integration/tests/717-sdist-test/files/packagea/src/TH.hs | 1 - test/integration/tests/717-sdist-test/files/packageb/src/Lib.hs | 2 +- test/integration/tests/717-sdist-test/files/packageb/src/TH.hs | 1 - .../tests/717-sdist-test/files/packagecd/packagec/src/LibC.hs | 2 +- .../tests/717-sdist-test/files/packagecd/packagec/src/THC.hs | 1 - .../tests/717-sdist-test/files/packagecd/packaged/src/LibD.hs | 1 - test/integration/tests/717-sdist-test/files/packagee/src/Lib.hs | 1 - 9 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Stack/SDist.hs b/src/Stack/SDist.hs index 6633f1ae30..c314504992 100644 --- a/src/Stack/SDist.hs +++ b/src/Stack/SDist.hs @@ -379,7 +379,7 @@ buildExtractedTarball pkgDir = do envConfig <- view envConfigL menv <- getMinimalEnvOverride localPackageToBuild <- readLocalPackage pkgDir - let packageEntries = (bcPackageEntries (envConfigBuildConfig envConfig)) + let packageEntries = bcPackageEntries (envConfigBuildConfig envConfig) getPaths entry = do resolvedEntry <- resolvePackageEntry menv projectRoot entry return $ fmap fst resolvedEntry diff --git a/test/integration/tests/717-sdist-test/files/packagea/src/Lib.hs b/test/integration/tests/717-sdist-test/files/packagea/src/Lib.hs index 7d233ffa06..26d2841b8f 100644 --- a/test/integration/tests/717-sdist-test/files/packagea/src/Lib.hs +++ b/test/integration/tests/717-sdist-test/files/packagea/src/Lib.hs @@ -7,4 +7,4 @@ import TH import Language.Haskell.TH someFunc :: IO () -someFunc = putStrLn (show $(thFunc)) +someFunc = print $(thFunc) diff --git a/test/integration/tests/717-sdist-test/files/packagea/src/TH.hs b/test/integration/tests/717-sdist-test/files/packagea/src/TH.hs index ebf5fe47eb..df44b9d8ae 100644 --- a/test/integration/tests/717-sdist-test/files/packagea/src/TH.hs +++ b/test/integration/tests/717-sdist-test/files/packagea/src/TH.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE TemplateHaskell #-} module TH (thFunc) where import Language.Haskell.TH diff --git a/test/integration/tests/717-sdist-test/files/packageb/src/Lib.hs b/test/integration/tests/717-sdist-test/files/packageb/src/Lib.hs index 7d233ffa06..26d2841b8f 100644 --- a/test/integration/tests/717-sdist-test/files/packageb/src/Lib.hs +++ b/test/integration/tests/717-sdist-test/files/packageb/src/Lib.hs @@ -7,4 +7,4 @@ import TH import Language.Haskell.TH someFunc :: IO () -someFunc = putStrLn (show $(thFunc)) +someFunc = print $(thFunc) diff --git a/test/integration/tests/717-sdist-test/files/packageb/src/TH.hs b/test/integration/tests/717-sdist-test/files/packageb/src/TH.hs index da217ccadc..5f13e7814a 100644 --- a/test/integration/tests/717-sdist-test/files/packageb/src/TH.hs +++ b/test/integration/tests/717-sdist-test/files/packageb/src/TH.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE TemplateHaskell #-} module TH (thFunc) where import Language.Haskell.TH diff --git a/test/integration/tests/717-sdist-test/files/packagecd/packagec/src/LibC.hs b/test/integration/tests/717-sdist-test/files/packagecd/packagec/src/LibC.hs index 5f6896467d..84036ad3cb 100644 --- a/test/integration/tests/717-sdist-test/files/packagecd/packagec/src/LibC.hs +++ b/test/integration/tests/717-sdist-test/files/packagecd/packagec/src/LibC.hs @@ -7,4 +7,4 @@ import THC import Language.Haskell.TH someFuncC :: IO () -someFuncC = putStrLn (show $(thFuncC)) +someFuncC = print $(thFuncC) diff --git a/test/integration/tests/717-sdist-test/files/packagecd/packagec/src/THC.hs b/test/integration/tests/717-sdist-test/files/packagecd/packagec/src/THC.hs index 0f31f2aeca..1180f8b3f9 100644 --- a/test/integration/tests/717-sdist-test/files/packagecd/packagec/src/THC.hs +++ b/test/integration/tests/717-sdist-test/files/packagecd/packagec/src/THC.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE TemplateHaskell #-} module THC (thFuncC) where import Language.Haskell.TH diff --git a/test/integration/tests/717-sdist-test/files/packagecd/packaged/src/LibD.hs b/test/integration/tests/717-sdist-test/files/packagecd/packaged/src/LibD.hs index 03a4506aaa..a0c7ad615e 100644 --- a/test/integration/tests/717-sdist-test/files/packagecd/packaged/src/LibD.hs +++ b/test/integration/tests/717-sdist-test/files/packagecd/packaged/src/LibD.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE TemplateHaskell #-} module LibD ( someFunc ) where diff --git a/test/integration/tests/717-sdist-test/files/packagee/src/Lib.hs b/test/integration/tests/717-sdist-test/files/packagee/src/Lib.hs index 4832ea5734..0d8704c625 100644 --- a/test/integration/tests/717-sdist-test/files/packagee/src/Lib.hs +++ b/test/integration/tests/717-sdist-test/files/packagee/src/Lib.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE TemplateHaskell #-} module Lib ( someFunc ) where