diff --git a/Library/Homebrew/cask/dsl.rb b/Library/Homebrew/cask/dsl.rb index d41c2df75a074..a4819be61d793 100644 --- a/Library/Homebrew/cask/dsl.rb +++ b/Library/Homebrew/cask/dsl.rb @@ -345,7 +345,7 @@ def livecheckable? 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 fcd1d87dfa0f4..ed485da4bd446 100644 --- a/Library/Homebrew/cleanup.rb +++ b/Library/Homebrew/cleanup.rb @@ -231,7 +231,7 @@ def self.skip_clean_formula?(formula) 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 9b629ccf0e2ce..358f1a200f6ae 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -691,7 +691,7 @@ def check_for_non_prefixed_coreutils return unless coreutils.any_version_installed? gnubin = %W[#{coreutils.opt_libexec}/gnubin #{coreutils.libexec}/gnubin] - return if (paths & gnubin).empty? + return if !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 f3d43a7db0015..0e74b6da65c4b 100644 --- a/Library/Homebrew/extend/os/mac/diagnostic.rb +++ b/Library/Homebrew/extend/os/mac/diagnostic.rb @@ -96,7 +96,7 @@ def check_for_non_prefixed_findutils 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 29065b26aa26a..4560cbb4a693a 100644 --- a/Library/Homebrew/rubocops/service.rb +++ b/Library/Homebrew/rubocops/service.rb @@ -33,7 +33,7 @@ def audit_formula(_node, _class_node, _parent_class_node, body_node) # 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 3b1765157098e..6af17fcd03854 100644 --- a/Library/Homebrew/test/spec_helper.rb +++ b/Library/Homebrew/test/spec_helper.rb @@ -217,7 +217,7 @@ def find_files @__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 diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb index 1377fa709faec..85daf25eab756 100644 --- a/Library/Homebrew/utils/curl.rb +++ b/Library/Homebrew/utils/curl.rb @@ -229,7 +229,7 @@ def curl_headers(*args, wanted_headers: [], **options) if request_args.empty? # If we didn't get any wanted header yet, retry using `GET`. next if wanted_headers.any? && - parsed_output.fetch(:responses).none? { |r| (r.fetch(:headers).keys & wanted_headers).any? } + parsed_output.fetch(:responses).none? { |r| r.fetch(:headers).keys.intersect?(wanted_headers) } # Some CDNs respond with 400 codes for `HEAD` but resolve with `GET`. next if (400..499).cover?(parsed_output.fetch(:responses).last&.fetch(:status_code).to_i)