Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge.hs: cleanup: one more 'filter (`notElem` a)' -> 'L.\\ a'

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
  • Loading branch information...
commit 57a1e420b4749b6524517e37ba4714377a11664f 1 parent 7e8d237
@trofi trofi authored
Showing with 2 additions and 3 deletions.
  1. +2 −3 Merge.hs
View
5 Merge.hs
@@ -226,8 +226,7 @@ mergeGenericPackageDescription verbosity overlayPath cat pkgGenericDesc fetch =
common_flags = map fst common_fa
active_flags = all_flags L.\\ common_flags
active_flag_descs = filter (\x -> Cabal.flagName x `elem` active_flags) cabal_flag_descs
- -- flags that are failed to resolve
- deadFlags = filter (\fa -> fa `notElem` successfully_resolved_flag_assignments) all_possible_flag_assignments
+ irresolvable_flag_assignments = all_possible_flag_assignments L.\\ successfully_resolved_flag_assignments
-- and finally prettify all deps:
leave_only_dynamic_fa :: Cabal.FlagAssignment -> Cabal.FlagAssignment
leave_only_dynamic_fa fa = fa L.\\ common_fa
@@ -347,7 +346,7 @@ mergeGenericPackageDescription verbosity overlayPath cat pkgGenericDesc fetch =
notice verbosity $ "Accepted depends: " ++ show (map display accepted_deps)
notice verbosity $ "Skipped depends: " ++ show (map display skipped_deps)
notice verbosity $ "Dropped depends: " ++ show (map display dropped_deps)
- notice verbosity $ "Dead flags: " ++ show (map pp_fa deadFlags)
+ notice verbosity $ "Dead flags: " ++ show (map pp_fa irresolvable_flag_assignments)
notice verbosity $ "Dropped flags: " ++ show (map (unFlagName.fst) common_fa)
-- mapM_ print tdeps

0 comments on commit 57a1e42

Please sign in to comment.
Something went wrong with that request. Please try again.