diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml index f4110dc106..08b76daeec 100644 --- a/Library/.rubocop.yml +++ b/Library/.rubocop.yml @@ -459,8 +459,6 @@ Performance/MapCompact: Enabled: false Style/ArgumentsForwarding: Enabled: false -Style/ArrayIntersect: - Enabled: false Style/HashSyntax: EnforcedShorthandSyntax: either Style/RedundantFreeze: diff --git a/Library/Homebrew/cask/dsl.rb b/Library/Homebrew/cask/dsl.rb index bf875e07aa..d139d90b5b 100644 --- a/Library/Homebrew/cask/dsl.rb +++ b/Library/Homebrew/cask/dsl.rb @@ -374,7 +374,7 @@ module Cask define_method(klass.dsl_key) do |*args, **kwargs| T.bind(self, DSL) if [*artifacts.map(&:class), klass].include?(Artifact::StageOnly) && - (artifacts.map(&:class) & ACTIVATABLE_ARTIFACT_CLASSES).any? + artifacts.map(&:class).intersect?(ACTIVATABLE_ARTIFACT_CLASSES) raise CaskInvalidError.new(cask, "'stage_only' must be the only activatable artifact.") end diff --git a/Library/Homebrew/cleanup.rb b/Library/Homebrew/cleanup.rb index b92b6f02f5..19348c6a4c 100644 --- a/Library/Homebrew/cleanup.rb +++ b/Library/Homebrew/cleanup.rb @@ -232,7 +232,7 @@ module Homebrew return false if no_cleanup_formula.blank? @skip_clean_formulae ||= no_cleanup_formula.split(",") - @skip_clean_formulae.include?(formula.name) || (@skip_clean_formulae & formula.aliases).present? + @skip_clean_formulae.include?(formula.name) || @skip_clean_formulae.intersect?(formula.aliases) end def self.periodic_clean_due? diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index f0bec7ee80..99630fe1f7 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -703,7 +703,7 @@ module Homebrew return unless coreutils.any_version_installed? gnubin = %W[#{coreutils.opt_libexec}/gnubin #{coreutils.libexec}/gnubin] - return if (paths & gnubin).empty? + return unless paths.intersect?(gnubin) <<~EOS Putting non-prefixed coreutils in your path can cause GMP builds to fail. diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb index f3d43a7db0..0e74b6da65 100644 --- a/Library/Homebrew/extend/os/mac/diagnostic.rb +++ b/Library/Homebrew/extend/os/mac/diagnostic.rb @@ -96,7 +96,7 @@ module Homebrew gnubin = %W[#{findutils.opt_libexec}/gnubin #{findutils.libexec}/gnubin] default_names = Tab.for_name("findutils").with? "default-names" - return if !default_names && (paths & gnubin).empty? + return if !default_names && !paths.intersect?(gnubin) <<~EOS Putting non-prefixed findutils in your path can cause python builds to fail. diff --git a/Library/Homebrew/rubocops/service.rb b/Library/Homebrew/rubocops/service.rb index 29065b26aa..4560cbb4a6 100644 --- a/Library/Homebrew/rubocops/service.rb +++ b/Library/Homebrew/rubocops/service.rb @@ -33,7 +33,7 @@ module RuboCop # NOTE: Solving the first problem here might solve the second one too # so we don't show both of them at the same time. - if (method_calls.keys & REQUIRED_METHOD_CALLS).empty? + if !method_calls.keys.intersect?(REQUIRED_METHOD_CALLS) offending_node(service_node) problem "Service blocks require `run` or `name` to be defined." elsif !method_calls.key?(:run) diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb index 36df0e8971..51ed09c898 100644 --- a/Library/Homebrew/test/spec_helper.rb +++ b/Library/Homebrew/test/spec_helper.rb @@ -217,7 +217,7 @@ RSpec.configure do |config| @__stdin = $stdin.clone begin - if (example.metadata.keys & [:focus, :byebug]).empty? && !ENV.key?("HOMEBREW_VERBOSE_TESTS") + if !example.metadata.keys.intersect?([:focus, :byebug]) && !ENV.key?("HOMEBREW_VERBOSE_TESTS") $stdout.reopen(File::NULL) $stderr.reopen(File::NULL) else