admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Use flat_map and other shortcuts

Browse Source
This commit is contained in:
Maxim Belkin 2018-04-07 13:28:15 -05:00
parent d6e0b7d2bf
commit 71fef1493d
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/linkage_checker.rb
View File

@ -47,8 +47,7 @@ class LinkageChecker
@system_dylibs << dylib @system_dylibs << dylib
rescue Errno::ENOENT rescue Errno::ENOENT
next if harmless_broken_link?(dylib) next if harmless_broken_link?(dylib)
dep = dylib_to_dep(dylib) if (dep = dylib_to_dep(dylib))
if dep.nil?
@broken_dylibs << dylib @broken_dylibs << dylib
else else
@broken_deps[dep] << dylib @broken_deps[dep] << dylib
@ -97,11 +96,7 @@ class LinkageChecker
next true if Formula[name].bin.directory? next true if Formula[name].bin.directory?
@brewed_dylibs.keys.map { |x| x.split("/").last }.include?(name) @brewed_dylibs.keys.map { |x| x.split("/").last }.include?(name)
end end
missing_deps = @broken_deps.values.map do |v| missing_deps = @broken_deps.values.flat_map { |d| dylib_to_dep(d) }.compact
v.map do |d|
dylib_to_dep(d)
end
end.flatten.compact
unnecessary_deps -= missing_deps unnecessary_deps -= missing_deps
[indirect_deps, undeclared_deps, unnecessary_deps] [indirect_deps, undeclared_deps, unnecessary_deps]
end end
@ -124,7 +119,7 @@ class LinkageChecker
display_items "Indirect dependencies with linkage", @indirect_deps display_items "Indirect dependencies with linkage", @indirect_deps
display_items "Variable-referenced libraries", @variable_dylibs display_items "Variable-referenced libraries", @variable_dylibs
display_items "Missing libraries", @broken_dylibs display_items "Missing libraries", @broken_dylibs
display_items "Missing dependencies", @broken_deps display_items "Broken dependencies", @broken_deps
display_items "Undeclared dependencies with linkage", @undeclared_deps display_items "Undeclared dependencies with linkage", @undeclared_deps
display_items "Dependencies with no linkage", @unnecessary_deps display_items "Dependencies with no linkage", @unnecessary_deps
end end
@ -144,7 +139,7 @@ class LinkageChecker
def display_test_output def display_test_output
display_items "Missing libraries", @broken_dylibs display_items "Missing libraries", @broken_dylibs
display_items "Missing dependencies", @broken_deps display_items "Broken dependencies", @broken_deps
display_items "Dependencies with no linkage", @unnecessary_deps display_items "Dependencies with no linkage", @unnecessary_deps
puts "No broken dylib links" if @broken_dylibs.empty? puts "No broken dylib links" if @broken_dylibs.empty?
end end