on master help sign in
Fix some warnings
commit9e6815a8d3d3d3bbc98d2ac88eaaf6cbbcaf1f97 authorMichael Snoyman <michael@snoyman.com> dateMon 3 Jun 2013, 16:08 (13 years ago) parent05e45b4
2 files changed+4−5
Stackage/LoadDatabase.hs+4−4 Stackage/NarrowDatabase.hs−1
Stackage/LoadDatabase.hs+4−4
@@ -104,7 +104,7 @@ loadPackageDB settings coreMap core deps = do
104104 else mconcat $ map (go gpd . snd) $ condTestSuites gpd
105105 , mconcat $ map (go gpd . snd) $ condBenchmarks gpd
106106 ], not $ null $ condTestSuites gpd
107− , Set.fromList $ map depName $ allBuildInfo p gpd
107+ , Set.fromList $ map depName $ allBuildInfo gpd
108108 , Just gpd
109109 , Set.fromList $ map (Executable . fst) $ condExecutables gpd
110110 , listToMaybe $ catMaybes
@@ -113,7 +113,7 @@ loadPackageDB settings coreMap core deps = do
113113 )
114114 _ -> (mempty, defaultHasTestSuites, Set.empty, Nothing, Set.empty, Nothing)
115115 where
116− allBuildInfo p gpd = concat
116+ allBuildInfo gpd = concat
117117 [ maybe mempty (goBI libBuildInfo) $ condLibrary gpd
118118 , concat $ map (goBI buildInfo . snd) $ condExecutables gpd
119119 , if skipTests p
@@ -123,10 +123,10 @@ loadPackageDB settings coreMap core deps = do
123123 ]
124124 where
125125 goBI f x = buildTools $ f $ condTreeData x
126− depName (Dependency (PackageName p) _) = Executable p
126+ depName (Dependency (PackageName pn) _) = Executable pn
127127 go gpd tree
128128 = Map.unionsWith unionVersionRanges
129− $ Map.fromList (map (\(Dependency p vr) -> (p, vr)) $ condTreeConstraints tree)
129+ $ Map.fromList (map (\(Dependency pn vr) -> (pn, vr)) $ condTreeConstraints tree)
130130 : map (go gpd) (mapMaybe (checkCond gpd) $ condTreeComponents tree)
131131
132132 checkCond gpd (cond, tree, melse)
Stackage/NarrowDatabase.hs−1
@@ -6,7 +6,6 @@ import qualified Data.Set as Set
66import Prelude hiding (pi)
77import Stackage.Types
88import Stackage.Util
9−import System.Exit (exitFailure)
109
1110-- | Narrow down the database to only the specified packages and all of
1211-- their dependencies.