git.iko.soy/stackage
on master help sign in
Cleaned up warnings
66e9032Michael Snoyman
Stackage/Build.hs+1−1
compare with master
unifiedsplit
@@ -10,7 +10,7 @@ import qualified Data.Map as Map
10import Data.Set (empty)
10import Data.Set (empty)
11import qualified Data.Set as Set
11import qualified Data.Set as Set
12import Distribution.Text (simpleParse)
12import Distribution.Text (simpleParse)
13−import Distribution.Version (thisVersion, withinRange)
13+import Distribution.Version (withinRange)
14import Stackage.CheckPlan
14import Stackage.CheckPlan
15import Stackage.Config
15import Stackage.Config
16import Stackage.InstallInfo
16import Stackage.InstallInfo
Stackage/Config.hs+1−1
@@ -3,7 +3,7 @@ module Stackage.Config where
3
3
4import Control.Monad.Trans.Writer (execWriter, tell)
4import Control.Monad.Trans.Writer (execWriter, tell)
5import qualified Data.Map as Map
5import qualified Data.Map as Map
6−import Data.Set (fromList, singleton)
6+import Data.Set (fromList)
7import Distribution.Text (simpleParse)
7import Distribution.Text (simpleParse)
8import Stackage.Types
8import Stackage.Types
9
9
Stackage/InstallInfo.hs−1
@@ -10,7 +10,6 @@ import qualified Data.Set as Set
10import Data.Version (showVersion)
10import Data.Version (showVersion)
11import qualified Distribution.Text
11import qualified Distribution.Text
12import Distribution.Version (withinRange, simplifyVersionRange)
12import Distribution.Version (withinRange, simplifyVersionRange)
13−import Stackage.Config
14import Stackage.HaskellPlatform
13import Stackage.HaskellPlatform
15import Stackage.LoadDatabase
14import Stackage.LoadDatabase
16import Stackage.NarrowDatabase
15import Stackage.NarrowDatabase
Stackage/LoadDatabase.hs+5−7
@@ -12,7 +12,6 @@ import Distribution.Compiler (CompilerFlavor (GHC))
12import Distribution.Package (Dependency (Dependency))
12import Distribution.Package (Dependency (Dependency))
13import Distribution.PackageDescription (Condition (..),
13import Distribution.PackageDescription (Condition (..),
14 ConfVar (..),
14 ConfVar (..),
15− allBuildInfo,
16 benchmarkBuildInfo,
15 benchmarkBuildInfo,
17 buildInfo, buildTools,
16 buildInfo, buildTools,
18 condBenchmarks,
17 condBenchmarks,
@@ -25,7 +24,6 @@ import Distribution.PackageDescription (Condition (..),
25 flagDefault, flagName,
24 flagDefault, flagName,
26 genPackageFlags,
25 genPackageFlags,
27 libBuildInfo,
26 libBuildInfo,
28− packageDescription,
29 testBuildInfo,
27 testBuildInfo,
30 FlagName (FlagName))
28 FlagName (FlagName))
31import Distribution.PackageDescription.Parse (ParseResult (ParseOk),
29import Distribution.PackageDescription.Parse (ParseResult (ParseOk),
@@ -73,12 +71,12 @@ loadPackageDB settings core deps = do
73 _ ->
71 _ ->
74 case Tar.entryContent e of
72 case Tar.entryContent e of
75 Tar.NormalFile bs _ -> do
73 Tar.NormalFile bs _ -> do
76− let (deps', hasTests, buildTools) = parseDeps bs
74+ let (deps', hasTests, buildTools') = parseDeps bs
77 return $ mappend pdb $ PackageDB $ Map.singleton p PackageInfo
75 return $ mappend pdb $ PackageDB $ Map.singleton p PackageInfo
78 { piVersion = v
76 { piVersion = v
79 , piDeps = deps'
77 , piDeps = deps'
80 , piHasTests = hasTests
78 , piHasTests = hasTests
81− , piBuildTools = buildTools
79+ , piBuildTools = buildTools'
82 }
80 }
83 _ -> return pdb
81 _ -> return pdb
84
82
@@ -113,7 +111,7 @@ loadPackageDB settings core deps = do
113 where
111 where
114 checkCond' (Var (OS os)) = os == buildOS
112 checkCond' (Var (OS os)) = os == buildOS
115 checkCond' (Var (Arch arch)) = arch == buildArch
113 checkCond' (Var (Arch arch)) = arch == buildArch
116− checkCond' (Var (Flag flag)) = flag `elem` flags
114+ checkCond' (Var (Flag flag)) = flag `elem` flags'
117 checkCond' (Var (Impl compiler range)) =
115 checkCond' (Var (Impl compiler range)) =
118 compiler == GHC && withinRange targetCompilerVersion range
116 compiler == GHC && withinRange targetCompilerVersion range
119 checkCond' (Lit b) = b
117 checkCond' (Lit b) = b
@@ -121,5 +119,5 @@ loadPackageDB settings core deps = do
121 checkCond' (COr c1 c2) = checkCond' c1 || checkCond' c2
119 checkCond' (COr c1 c2) = checkCond' c1 || checkCond' c2
122 checkCond' (CAnd c1 c2) = checkCond' c1 && checkCond' c2
120 checkCond' (CAnd c1 c2) = checkCond' c1 && checkCond' c2
123
121
124− flags = map flagName (filter flagDefault $ genPackageFlags gpd) ++
122+ flags' = map flagName (filter flagDefault $ genPackageFlags gpd) ++
125− (map FlagName $ Set.toList $ Stackage.Types.flags settings)
123+ (map FlagName $ Set.toList $ Stackage.Types.flags settings)
Stackage/Test.hs+8−11
@@ -4,17 +4,14 @@ module Stackage.Test
4 ) where
4 ) where
5
5
6import qualified Control.Concurrent as C
6import qualified Control.Concurrent as C
7−import Control.Exception (Exception, handle, throwIO, finally, SomeException)
7+import Control.Exception (Exception, handle, throwIO, SomeException)
8−import Control.Monad (foldM, unless, when, replicateM)
8+import Control.Monad (unless, when, replicateM)
9import qualified Data.Map as Map
9import qualified Data.Map as Map
10import qualified Data.Set as Set
10import qualified Data.Set as Set
11import Data.Typeable (Typeable)
11import Data.Typeable (Typeable)
12−import Stackage.Config
13import Stackage.Types
12import Stackage.Types
14import Stackage.Util
13import Stackage.Util
15−import System.Directory (canonicalizePath, createDirectory,
14+import System.Directory (createDirectory, removeFile)
16− removeFile)
17−import System.Environment (getEnvironment)
18import System.Exit (ExitCode (ExitSuccess))
15import System.Exit (ExitCode (ExitSuccess))
19import System.FilePath ((<.>), (</>))
16import System.FilePath ((<.>), (</>))
20import System.IO (IOMode (WriteMode, AppendMode),
17import System.IO (IOMode (WriteMode, AppendMode),
@@ -39,12 +36,12 @@ parFoldM :: Int -- ^ number of threads
39 -> a
36 -> a
40 -> [b]
37 -> [b]
41 -> IO a
38 -> IO a
42−parFoldM threadCount f g a0 bs0 = do
39+parFoldM threadCount0 f g a0 bs0 = do
43 ma <- C.newMVar a0
40 ma <- C.newMVar a0
44 mbs <- C.newMVar bs0
41 mbs <- C.newMVar bs0
45 signal <- C.newEmptyMVar
42 signal <- C.newEmptyMVar
46− tids <- replicateM threadCount $ C.forkIO $ worker ma mbs signal
43+ tids <- replicateM threadCount0 $ C.forkIO $ worker ma mbs signal
47− wait threadCount signal tids
44+ wait threadCount0 signal tids
48 C.takeMVar ma
45 C.takeMVar ma
49 where
46 where
50 worker ma mbs signal =
47 worker ma mbs signal =
@@ -90,8 +87,8 @@ runTestSuite settings testdir hasTestSuites (packageName, (version, Maintainer m
90 $ ("HASKELL_PACKAGE_SANDBOX", packageDir settings)
87 $ ("HASKELL_PACKAGE_SANDBOX", packageDir settings)
91 : env'
88 : env'
92
89
93− let runGen addGPP cmd args wdir handle = do
90+ let runGen addGPP cmd args wdir handle' = do
94− ph <- runProcess cmd args (Just wdir) (menv addGPP) Nothing (Just handle) (Just handle)
91+ ph <- runProcess cmd args (Just wdir) (menv addGPP) Nothing (Just handle') (Just handle')
95 ec <- waitForProcess ph
92 ec <- waitForProcess ph
96 unless (ec == ExitSuccess) $ throwIO TestException
93 unless (ec == ExitSuccess) $ throwIO TestException
97
94
Stackage/Util.hs+2
@@ -71,12 +71,14 @@ getPackageVersion e = do
71defaultHasTestSuites :: Bool
71defaultHasTestSuites :: Bool
72defaultHasTestSuites = True
72defaultHasTestSuites = True
73
73
74+packageDir, libDir, binDir, dataDir, docDir :: BuildSettings -> FilePath
74packageDir = (</> "package-db") . sandboxRoot
75packageDir = (</> "package-db") . sandboxRoot
75libDir = (</> "lib") . sandboxRoot
76libDir = (</> "lib") . sandboxRoot
76binDir = (</> "bin") . sandboxRoot
77binDir = (</> "bin") . sandboxRoot
77dataDir = (</> "share") . sandboxRoot
78dataDir = (</> "share") . sandboxRoot
78docDir x = sandboxRoot x </> "share" </> "doc" </> "$pkgid"
79docDir x = sandboxRoot x </> "share" </> "doc" </> "$pkgid"
79
80
81+addCabalArgs :: BuildSettings -> [String] -> [String]
80addCabalArgs settings rest
82addCabalArgs settings rest
81 = "--package-db=clear"
83 = "--package-db=clear"
82 : "--package-db=global"
84 : "--package-db=global"