From 5a3d6c4c8f8254c8234157c16dbb80c23ffd49b1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 25 Oct 2016 23:48:34 +0100 Subject: [PATCH] uninstall, keg: update style --- Library/Homebrew/cmd/uninstall.rb | 4 ++-- Library/Homebrew/keg.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb index e13ca83853..a05adece69 100644 --- a/Library/Homebrew/cmd/uninstall.rb +++ b/Library/Homebrew/cmd/uninstall.rb @@ -16,10 +16,10 @@ module Homebrew raise KegUnspecifiedError if ARGV.named.empty? kegs_by_rack = if ARGV.force? - Hash[ARGV.named.map { |name| + Hash[ARGV.named.map do |name| rack = Formulary.to_rack(name) [rack, rack.subdirs.map { |d| Keg.new(d) }] - }] + end] else ARGV.kegs.group_by(&:rack) end diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index d86236037b..ccd3cc2c15 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -104,9 +104,9 @@ class Keg # so need them to be calculated now. # # This happens after the initial dependency check because it's sloooow. - remaining_formulae = Formula.installed.select { |f| + remaining_formulae = Formula.installed.select do |f| f.installed_kegs.any? { |k| Tab.for_keg(k).runtime_dependencies.nil? } - } + end keg_names = kegs.map(&:name) kegs_by_name = kegs.group_by(&:to_formula)