4 files changed, 5 insertions, 5 deletions
diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb
index 84a93859f..3bb1d4fbb 100644
--- a/Library/Homebrew/cmd/audit.rb
+++ b/Library/Homebrew/cmd/audit.rb
@@ -242,7 +242,7 @@ class FormulaAuditor
     if @online
       same_name_tap_formulae += @@remote_official_taps.map do |tap|
         Thread.new { Homebrew.search_tap "homebrew", tap, name }
-      end.map(&:value).flatten
+      end.flat_map(&:value)
     end
 
     same_name_tap_formulae.delete(full_name)
diff --git a/Library/Homebrew/cmd/commands.rb b/Library/Homebrew/cmd/commands.rb
index 1d4022f8d..2bb18b3e0 100644
--- a/Library/Homebrew/cmd/commands.rb
+++ b/Library/Homebrew/cmd/commands.rb
@@ -26,7 +26,7 @@ module Homebrew
   end
 
   def external_commands
-    paths.map { |p| Dir["#{p}/brew-*"] }.flatten.
+    paths.flat_map { |p| Dir["#{p}/brew-*"] }.
       map { |f| File.basename(f, ".rb")[5..-1] }.
       reject { |f| f =~ /\./ }
   end
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 2a7c7abb1..02e26e82b 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -1220,7 +1220,7 @@ class Checks
   end
 
   def check_for_external_cmd_name_conflict
-    cmds = paths.map { |p| Dir["#{p}/brew-*"] }.flatten.uniq
+    cmds = paths.flat_map { |p| Dir["#{p}/brew-*"] }.uniq
     cmds = cmds.select { |cmd| File.file?(cmd) && File.executable?(cmd) }
     cmd_map = {}
     cmds.each do |cmd|
diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb
index 068f26835..cdb0e6859 100644
--- a/Library/Homebrew/cmd/list.rb
+++ b/Library/Homebrew/cmd/list.rb
@@ -68,8 +68,8 @@ module Homebrew
     dirs.delete "var"
 
     args = dirs + %w[-type f (]
-    args.concat UNBREWED_EXCLUDE_FILES.map { |f| %W[! -name #{f}] }.flatten
-    args.concat UNBREWED_EXCLUDE_PATHS.map { |d| %W[! -path #{d}] }.flatten
+    args.concat UNBREWED_EXCLUDE_FILES.flat_map { |f| %W[! -name #{f}] }
+    args.concat UNBREWED_EXCLUDE_PATHS.flat_map { |d| %W[! -path #{d}] }
     args.concat %w[)]
 
     cd HOMEBREW_PREFIX