66e9032 · stackage · git.iko.soy

git.iko.soy/stackage

Cleaned up warnings

commit66e903214270581174f3137cddc44e1e4745a2e2 authorMichael Snoyman <michael@snoyman.com> dateMon 17 Dec 2012, 15:45 (14 years ago) parent5a410bf

6 files changed+17−21

compare with master

unifiedsplit

Stackage/Build.hs+1−1 Stackage/Config.hs+1−1 Stackage/InstallInfo.hs−1 Stackage/LoadDatabase.hs+5−7 Stackage/Test.hs+8−11 Stackage/Util.hs+2

Stackage/Build.hs+1−1

@@ -10,7 +10,7 @@ import qualified Data.Map as Map

1010import Data.Set (empty)

1111import qualified Data.Set as Set

1212import Distribution.Text (simpleParse)

13−import Distribution.Version (thisVersion, withinRange)

13+import Distribution.Version (withinRange)

1414import Stackage.CheckPlan

1515import Stackage.Config

1616import Stackage.InstallInfo

Stackage/Config.hs+1−1

@@ -3,7 +3,7 @@ module Stackage.Config where

44import Control.Monad.Trans.Writer (execWriter, tell)

55import qualified Data.Map as Map

6−import Data.Set (fromList, singleton)

6+import Data.Set (fromList)

77import Distribution.Text (simpleParse)

88import Stackage.Types

Stackage/InstallInfo.hs−1

@@ -10,7 +10,6 @@ import qualified Data.Set as Set

1010import Data.Version (showVersion)

1111import qualified Distribution.Text

1212import Distribution.Version (withinRange, simplifyVersionRange)

13−import Stackage.Config

1413import Stackage.HaskellPlatform

1514import Stackage.LoadDatabase

1615import Stackage.NarrowDatabase

Stackage/LoadDatabase.hs+5−7

@@ -12,7 +12,6 @@ import Distribution.Compiler (CompilerFlavor (GHC))

1212import Distribution.Package (Dependency (Dependency))

1313import Distribution.PackageDescription (Condition (..),

1414 ConfVar (..),

15− allBuildInfo,

1615 benchmarkBuildInfo,

1716 buildInfo, buildTools,

1817 condBenchmarks,

@@ -25,7 +24,6 @@ import Distribution.PackageDescription (Condition (..),

2524 flagDefault, flagName,

2625 genPackageFlags,

2726 libBuildInfo,

28− packageDescription,

2927 testBuildInfo,

3028 FlagName (FlagName))

3129import Distribution.PackageDescription.Parse (ParseResult (ParseOk),

@@ -73,12 +71,12 @@ loadPackageDB settings core deps = do

7371 _ ->

7472 case Tar.entryContent e of

7573 Tar.NormalFile bs _ -> do

76− let (deps', hasTests, buildTools) = parseDeps bs

74+ let (deps', hasTests, buildTools') = parseDeps bs

7775 return $ mappend pdb $ PackageDB $ Map.singleton p PackageInfo

7876 { piVersion = v

7977 , piDeps = deps'

8078 , piHasTests = hasTests

81− , piBuildTools = buildTools

79+ , piBuildTools = buildTools'

8280 }

8381 _ -> return pdb

8482

@@ -113,7 +111,7 @@ loadPackageDB settings core deps = do

113111 where

114112 checkCond' (Var (OS os)) = os == buildOS

115113 checkCond' (Var (Arch arch)) = arch == buildArch

116− checkCond' (Var (Flag flag)) = flag `elem` flags

114+ checkCond' (Var (Flag flag)) = flag `elem` flags'

117115 checkCond' (Var (Impl compiler range)) =

118116 compiler == GHC && withinRange targetCompilerVersion range

119117 checkCond' (Lit b) = b

@@ -121,5 +119,5 @@ loadPackageDB settings core deps = do

121119 checkCond' (COr c1 c2) = checkCond' c1 || checkCond' c2

122120 checkCond' (CAnd c1 c2) = checkCond' c1 && checkCond' c2

123121

124− flags = map flagName (filter flagDefault $ genPackageFlags gpd) ++

125− (map FlagName $ Set.toList $ Stackage.Types.flags settings)

122+ flags' = map flagName (filter flagDefault $ genPackageFlags gpd) ++

123+ (map FlagName $ Set.toList $ Stackage.Types.flags settings)

Stackage/Test.hs+8−11

@@ -4,17 +4,14 @@ module Stackage.Test

44 ) where

66import qualified Control.Concurrent as C

7−import Control.Exception (Exception, handle, throwIO, finally, SomeException)

8−import Control.Monad (foldM, unless, when, replicateM)

7+import Control.Exception (Exception, handle, throwIO, SomeException)

8+import Control.Monad (unless, when, replicateM)

99import qualified Data.Map as Map

1010import qualified Data.Set as Set

1111import Data.Typeable (Typeable)

12−import Stackage.Config

1312import Stackage.Types

1413import Stackage.Util

15−import System.Directory (canonicalizePath, createDirectory,

16− removeFile)

17−import System.Environment (getEnvironment)

14+import System.Directory (createDirectory, removeFile)

1815import System.Exit (ExitCode (ExitSuccess))

1916import System.FilePath ((<.>), (</>))

2017import System.IO (IOMode (WriteMode, AppendMode),

@@ -39,12 +36,12 @@ parFoldM :: Int -- ^ number of threads

3936 -> a

4037 -> [b]

4138 -> IO a

42−parFoldM threadCount f g a0 bs0 = do

39+parFoldM threadCount0 f g a0 bs0 = do

4340 ma <- C.newMVar a0

4441 mbs <- C.newMVar bs0

4542 signal <- C.newEmptyMVar

46− tids <- replicateM threadCount $ C.forkIO $ worker ma mbs signal

47− wait threadCount signal tids

43+ tids <- replicateM threadCount0 $ C.forkIO $ worker ma mbs signal

44+ wait threadCount0 signal tids

4845 C.takeMVar ma

4946 where

5047 worker ma mbs signal =

@@ -90,8 +87,8 @@ runTestSuite settings testdir hasTestSuites (packageName, (version, Maintainer m

9087 $ ("HASKELL_PACKAGE_SANDBOX", packageDir settings)

9188 : env'

9289

93− let runGen addGPP cmd args wdir handle = do

94− ph <- runProcess cmd args (Just wdir) (menv addGPP) Nothing (Just handle) (Just handle)

90+ let runGen addGPP cmd args wdir handle' = do

91+ ph <- runProcess cmd args (Just wdir) (menv addGPP) Nothing (Just handle') (Just handle')

9592 ec <- waitForProcess ph

9693 unless (ec == ExitSuccess) $ throwIO TestException

9794

Stackage/Util.hs+2

@@ -71,12 +71,14 @@ getPackageVersion e = do

7171defaultHasTestSuites :: Bool

7272defaultHasTestSuites = True

7373

74+packageDir, libDir, binDir, dataDir, docDir :: BuildSettings -> FilePath

7475packageDir = (</> "package-db") . sandboxRoot

7576libDir = (</> "lib") . sandboxRoot

7677binDir = (</> "bin") . sandboxRoot

7778dataDir = (</> "share") . sandboxRoot

7879docDir x = sandboxRoot x </> "share" </> "doc" </> "$pkgid"

7980

81+addCabalArgs :: BuildSettings -> [String] -> [String]

8082addCabalArgs settings rest

8183 = "--package-db=clear"

8284 : "--package-db=global"