Merge pull request #13849 from Homebrew/dependabot/bundler/Library/Ho…

…mebrew/rubocop-performance-1.15.0 build(deps): bump rubocop-performance from 1.14.3 to 1.15.0 in /Library/Homebrew
Homebrew · Sep 13, 2022 · db01704 · db01704
2 parents 0d4fb24 + 20d2bda
commit db01704
Show file tree

Hide file tree

Showing 61 changed files with 92 additions and 97 deletions.
diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
@@ -136,7 +136,7 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.14.3)
+    rubocop-performance (1.15.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.16.0)

diff --git a/...t/rbi/gems/rubocop-performance@1.14.3.rbi → ...t/rbi/gems/rubocop-performance@1.15.0.rbi b/...t/rbi/gems/rubocop-performance@1.14.3.rbi → ...t/rbi/gems/rubocop-performance@1.15.0.rbi
diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb
@@ -87,7 +87,7 @@
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-progressbar-1.11.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unicode-display_width-2.2.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-1.35.1/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-performance-1.14.3/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-performance-1.15.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rails-2.16.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rspec-2.12.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-sorbet-0.6.11/lib"

diff --git a/...cop-performance-1.14.3/config/default.yml → ...cop-performance-1.15.0/config/default.yml b/...cop-performance-1.14.3/config/default.yml → ...cop-performance-1.15.0/config/default.yml
@@ -1,5 +1,9 @@
 # This is the default configuration file.
 
+Performance:
+  Enabled: true
+  DocumentationBaseURL: https://docs.rubocop.org/rubocop-performance
+
 Performance/AncestorsInclude:
   Description: 'Use `A <= B` instead of `A.ancestors.include?(B)`.'
   Reference: 'https://github.com/JuanitoFatas/fast-ruby#ancestorsinclude-vs--code'

diff --git a/...-performance-1.14.3/config/obsoletion.yml → ...-performance-1.15.0/config/obsoletion.yml b/...-performance-1.14.3/config/obsoletion.yml → ...-performance-1.15.0/config/obsoletion.yml
diff --git a/...ormance-1.14.3/lib/rubocop-performance.rb → ...ormance-1.15.0/lib/rubocop-performance.rb b/...ormance-1.14.3/lib/rubocop-performance.rb → ...ormance-1.15.0/lib/rubocop-performance.rb
diff --git a/...rubocop/cop/mixin/regexp_metacharacter.rb → ...rubocop/cop/mixin/regexp_metacharacter.rb b/...rubocop/cop/mixin/regexp_metacharacter.rb → ...rubocop/cop/mixin/regexp_metacharacter.rb
diff --git a/....14.3/lib/rubocop/cop/mixin/sort_block.rb → ....15.0/lib/rubocop/cop/mixin/sort_block.rb b/....14.3/lib/rubocop/cop/mixin/sort_block.rb → ....15.0/lib/rubocop/cop/mixin/sort_block.rb
@@ -14,6 +14,13 @@ module SortBlock
           $send)
       PATTERN
 
+      def_node_matcher :sort_with_numblock?, <<~PATTERN
+        (numblock
+          $(send _ :sort)
+          $_arg_count
+          $send)
+      PATTERN
+
       def_node_matcher :replaceable_body?, <<~PATTERN
         (send (lvar %1) :<=> (lvar %2))
       PATTERN

diff --git a/...ocop/cop/performance/ancestors_include.rb → ...ocop/cop/performance/ancestors_include.rb b/...ocop/cop/performance/ancestors_include.rb → ...ocop/cop/performance/ancestors_include.rb
diff --git a/...rmance/array_semi_infinite_range_slice.rb → ...rmance/array_semi_infinite_range_slice.rb b/...rmance/array_semi_infinite_range_slice.rb → ...rmance/array_semi_infinite_range_slice.rb
diff --git a/...ance/big_decimal_with_numeric_argument.rb → ...ance/big_decimal_with_numeric_argument.rb b/...ance/big_decimal_with_numeric_argument.rb → ...ance/big_decimal_with_numeric_argument.rb
@@ -41,11 +41,7 @@ def on_send(node)
             end
           elsif (numeric_to_d = to_d?(node))
             add_offense(numeric_to_d.source_range) do |corrector|
-              big_decimal_args = node
-                                 .arguments
-                                 .map(&:source)
-                                 .unshift("'#{numeric_to_d.source}'")
-                                 .join(', ')
+              big_decimal_args = node.arguments.map(&:source).unshift("'#{numeric_to_d.source}'").join(', ')
 
               corrector.replace(node, "BigDecimal(#{big_decimal_args})")
             end

diff --git a/.../lib/rubocop/cop/performance/bind_call.rb → .../lib/rubocop/cop/performance/bind_call.rb b/.../lib/rubocop/cop/performance/bind_call.rb → .../lib/rubocop/cop/performance/bind_call.rb
@@ -26,8 +26,7 @@ class BindCall < Base
 
         minimum_target_ruby_version 2.7
 
-        MSG = 'Use `bind_call(%<bind_arg>s%<comma>s%<call_args>s)` ' \
-              'instead of `bind(%<bind_arg>s).call(%<call_args>s)`.'
+        MSG = 'Use `bind_call(%<bind_arg>s%<comma>s%<call_args>s)` instead of `bind(%<bind_arg>s).call(%<call_args>s)`.'
         RESTRICT_ON_SEND = %i[call].freeze
 
         def_node_matcher :bind_with_call_method?, <<~PATTERN

diff --git a/...rmance/block_given_with_explicit_block.rb → ...rmance/block_given_with_explicit_block.rb b/...rmance/block_given_with_explicit_block.rb → ...rmance/block_given_with_explicit_block.rb
diff --git a/...4.3/lib/rubocop/cop/performance/caller.rb → ...5.0/lib/rubocop/cop/performance/caller.rb b/...4.3/lib/rubocop/cop/performance/caller.rb → ...5.0/lib/rubocop/cop/performance/caller.rb
diff --git a/...ubocop/cop/performance/case_when_splat.rb → ...ubocop/cop/performance/case_when_splat.rb b/...ubocop/cop/performance/case_when_splat.rb → ...ubocop/cop/performance/case_when_splat.rb
@@ -99,8 +99,7 @@ def replacement(conditions)
 
         def inline_fix_branch(corrector, when_node)
           conditions = when_node.conditions
-          range = range_between(conditions[0].loc.expression.begin_pos,
-                                conditions[-1].loc.expression.end_pos)
+          range = range_between(conditions[0].loc.expression.begin_pos, conditions[-1].loc.expression.end_pos)
 
           corrector.replace(range, replacement(conditions))
         end
@@ -111,8 +110,7 @@ def reorder_condition(corrector, when_node)
           return if when_branches.one?
 
           corrector.remove(when_branch_range(when_node))
-          corrector.insert_after(when_branches.last.source_range,
-                                 reordering_correction(when_node))
+          corrector.insert_after(when_branches.last.source_range, reordering_correction(when_node))
         end
 
         def reordering_correction(when_node)
@@ -126,11 +124,9 @@ def reordering_correction(when_node)
         end
 
         def when_branch_range(when_node)
-          next_branch =
-            when_node.parent.when_branches[when_node.branch_index + 1]
+          next_branch = when_node.parent.when_branches[when_node.branch_index + 1]
 
-          range_between(when_node.source_range.begin_pos,
-                        next_branch.source_range.begin_pos)
+          range_between(when_node.source_range.begin_pos, next_branch.source_range.begin_pos)
         end
 
         def new_condition_with_then(node, new_condition)
@@ -162,13 +158,11 @@ def splat_offenses(when_conditions)
         def non_splat?(condition)
           variable, = *condition
 
-          (condition.splat_type? && variable.array_type?) ||
-            !condition.splat_type?
+          (condition.splat_type? && variable.array_type?) || !condition.splat_type?
         end
 
         def needs_reorder?(when_node)
-          following_branches =
-            when_node.parent.when_branches[(when_node.branch_index + 1)..]
+          following_branches = when_node.parent.when_branches[(when_node.branch_index + 1)..]
 
           following_branches.any? do |when_branch|
             when_branch.conditions.any? do |condition|

diff --git a/....3/lib/rubocop/cop/performance/casecmp.rb → ....0/lib/rubocop/cop/performance/casecmp.rb b/....3/lib/rubocop/cop/performance/casecmp.rb → ....0/lib/rubocop/cop/performance/casecmp.rb
diff --git a/...cop/performance/chain_array_allocation.rb → ...cop/performance/chain_array_allocation.rb b/...cop/performance/chain_array_allocation.rb → ...cop/performance/chain_array_allocation.rb
diff --git a/...performance/collection_literal_in_loop.rb → ...performance/collection_literal_in_loop.rb b/...performance/collection_literal_in_loop.rb → ...performance/collection_literal_in_loop.rb
@@ -104,9 +104,7 @@ def parent_is_loop?(node)
         end
 
         def loop?(ancestor, node)
-          keyword_loop?(ancestor.type) ||
-            kernel_loop?(ancestor) ||
-            node_within_enumerable_loop?(node, ancestor)
+          keyword_loop?(ancestor.type) || kernel_loop?(ancestor) || node_within_enumerable_loop?(node, ancestor)
         end
 
         def keyword_loop?(type)

diff --git a/...cop/cop/performance/compare_with_block.rb → ...cop/cop/performance/compare_with_block.rb b/...cop/cop/performance/compare_with_block.rb → ...cop/cop/performance/compare_with_block.rb
diff --git a/.../performance/concurrent_monotonic_time.rb → .../performance/concurrent_monotonic_time.rb b/.../performance/concurrent_monotonic_time.rb → .../performance/concurrent_monotonic_time.rb
diff --git a/...ubocop/cop/performance/constant_regexp.rb → ...ubocop/cop/performance/constant_regexp.rb b/...ubocop/cop/performance/constant_regexp.rb → ...ubocop/cop/performance/constant_regexp.rb
@@ -39,9 +39,7 @@ class ConstantRegexp < Base
         MSG = 'Extract this regexp into a constant, memoize it, or append an `/o` option to its options.'
 
         def on_regexp(node)
-          return if within_allowed_assignment?(node) ||
-                    !include_interpolated_const?(node) ||
-                    node.single_interpolation?
+          return if within_allowed_assignment?(node) || !include_interpolated_const?(node) || node.single_interpolation?
 
           add_offense(node) do |corrector|
             corrector.insert_after(node, 'o')

diff --git a/...14.3/lib/rubocop/cop/performance/count.rb → ...15.0/lib/rubocop/cop/performance/count.rb b/...14.3/lib/rubocop/cop/performance/count.rb → ...15.0/lib/rubocop/cop/performance/count.rb
diff --git a/.../rubocop/cop/performance/delete_prefix.rb → .../rubocop/cop/performance/delete_prefix.rb b/.../rubocop/cop/performance/delete_prefix.rb → .../rubocop/cop/performance/delete_prefix.rb
diff --git a/.../rubocop/cop/performance/delete_suffix.rb → .../rubocop/cop/performance/delete_suffix.rb b/.../rubocop/cop/performance/delete_suffix.rb → .../rubocop/cop/performance/delete_suffix.rb
diff --git a/...4.3/lib/rubocop/cop/performance/detect.rb → ...5.0/lib/rubocop/cop/performance/detect.rb b/...4.3/lib/rubocop/cop/performance/detect.rb → ...5.0/lib/rubocop/cop/performance/detect.rb
diff --git a/.../cop/performance/double_start_end_with.rb → .../cop/performance/double_start_end_with.rb b/.../cop/performance/double_start_end_with.rb → .../cop/performance/double_start_end_with.rb
@@ -41,8 +41,7 @@ module Performance
       class DoubleStartEndWith < Base
         extend AutoCorrector
 
-        MSG = 'Use `%<receiver>s.%<method>s(%<combined_args>s)` ' \
-              'instead of `%<original_code>s`.'
+        MSG = 'Use `%<receiver>s.%<method>s(%<combined_args>s)` instead of `%<original_code>s`.'
 
         def on_or(node)
           receiver, method, first_call_args, second_call_args = process_source(node)

diff --git a/...3/lib/rubocop/cop/performance/end_with.rb → ...0/lib/rubocop/cop/performance/end_with.rb b/...3/lib/rubocop/cop/performance/end_with.rb → ...0/lib/rubocop/cop/performance/end_with.rb
@@ -50,8 +50,7 @@ class EndWith < Base
         include RegexpMetacharacter
         extend AutoCorrector
 
-        MSG = 'Use `String#end_with?` instead of a regex match anchored to ' \
-              'the end of the string.'
+        MSG = 'Use `String#end_with?` instead of a regex match anchored to the end of the string.'
         RESTRICT_ON_SEND = %i[match =~ match?].freeze
 
         def_node_matcher :redundant_regex?, <<~PATTERN

diff --git a/...lib/rubocop/cop/performance/fixed_size.rb → ...lib/rubocop/cop/performance/fixed_size.rb b/...lib/rubocop/cop/performance/fixed_size.rb → ...lib/rubocop/cop/performance/fixed_size.rb
diff --git a/...3/lib/rubocop/cop/performance/flat_map.rb → ...0/lib/rubocop/cop/performance/flat_map.rb b/...3/lib/rubocop/cop/performance/flat_map.rb → ...0/lib/rubocop/cop/performance/flat_map.rb
diff --git a/...op/performance/inefficient_hash_search.rb → ...op/performance/inefficient_hash_search.rb b/...op/performance/inefficient_hash_search.rb → ...op/performance/inefficient_hash_search.rb
@@ -83,9 +83,7 @@ def current_method(node)
 
         def use_long_method
           preferred_config = config.for_all_cops['Style/PreferredHashMethods']
-          preferred_config &&
-            preferred_config['EnforcedStyle'] == 'long' &&
-            preferred_config['Enabled']
+          preferred_config && preferred_config['EnforcedStyle'] == 'long' && preferred_config['Enabled']
         end
 
         def autocorrect_argument(node)

diff --git a/...b/rubocop/cop/performance/io_readlines.rb → ...b/rubocop/cop/performance/io_readlines.rb b/...b/rubocop/cop/performance/io_readlines.rb → ...b/rubocop/cop/performance/io_readlines.rb
diff --git a/...ib/rubocop/cop/performance/map_compact.rb → ...ib/rubocop/cop/performance/map_compact.rb b/...ib/rubocop/cop/performance/map_compact.rb → ...ib/rubocop/cop/performance/map_compact.rb
diff --git a/...cop/performance/method_object_as_block.rb → ...cop/performance/method_object_as_block.rb b/...cop/performance/method_object_as_block.rb → ...cop/performance/method_object_as_block.rb
diff --git a/...ib/rubocop/cop/performance/open_struct.rb → ...ib/rubocop/cop/performance/open_struct.rb b/...ib/rubocop/cop/performance/open_struct.rb → ...ib/rubocop/cop/performance/open_struct.rb
@@ -32,8 +32,7 @@ module Performance
       #   end
       #
       class OpenStruct < Base
-        MSG = 'Consider using `Struct` over `OpenStruct` ' \
-              'to optimize the performance.'
+        MSG = 'Consider using `Struct` over `OpenStruct` to optimize the performance.'
         RESTRICT_ON_SEND = %i[new].freeze
 
         def_node_matcher :open_struct, <<~PATTERN

diff --git a/.../rubocop/cop/performance/range_include.rb → .../rubocop/cop/performance/range_include.rb b/.../rubocop/cop/performance/range_include.rb → .../rubocop/cop/performance/range_include.rb
diff --git a/...p/cop/performance/redundant_block_call.rb → ...p/cop/performance/redundant_block_call.rb b/...p/cop/performance/redundant_block_call.rb → ...p/cop/performance/redundant_block_call.rb
diff --git a/...ce/redundant_equality_comparison_block.rb → ...ce/redundant_equality_comparison_block.rb b/...ce/redundant_equality_comparison_block.rb → ...ce/redundant_equality_comparison_block.rb
diff --git a/...ubocop/cop/performance/redundant_match.rb → ...ubocop/cop/performance/redundant_match.rb b/...ubocop/cop/performance/redundant_match.rb → ...ubocop/cop/performance/redundant_match.rb
@@ -20,8 +20,7 @@ module Performance
       class RedundantMatch < Base
         extend AutoCorrector
 
-        MSG = 'Use `=~` in places where the `MatchData` returned by ' \
-              '`#match` will not be used.'
+        MSG = 'Use `=~` in places where the `MatchData` returned by `#match` will not be used.'
         RESTRICT_ON_SEND = %i[match].freeze
 
         # 'match' is a fairly generic name, so we don't flag it unless we see
@@ -41,21 +40,23 @@ def on_send(node)
                         !(node.parent && node.parent.block_type?)
 
           add_offense(node) do |corrector|
-            autocorrect(corrector, node)
+            autocorrect(corrector, node) if autocorrectable?(node)
           end
         end
 
         private
 
         def autocorrect(corrector, node)
-          # Regexp#match can take a second argument, but this cop doesn't
-          # register an offense in that case
-          return unless node.first_argument.regexp_type?
-
           new_source = "#{node.receiver.source} =~ #{node.first_argument.source}"
 
           corrector.replace(node.source_range, new_source)
         end
+
+        def autocorrectable?(node)
+          # Regexp#match can take a second argument, but this cop doesn't
+          # register an offense in that case
+          node.receiver.regexp_type? || node.first_argument.regexp_type?
+        end
       end
     end
   end

diff --git a/...ubocop/cop/performance/redundant_merge.rb → ...ubocop/cop/performance/redundant_merge.rb b/...ubocop/cop/performance/redundant_merge.rb → ...ubocop/cop/performance/redundant_merge.rb
@@ -99,8 +99,7 @@ def kwsplat_used?(pairs)
         end
 
         def non_redundant_value_used?(receiver, node)
-          node.value_used? &&
-            !EachWithObjectInspector.new(node, receiver).value_used?
+          node.value_used? && !EachWithObjectInspector.new(node, receiver).value_used?
         end
 
         def correct_multiple_elements(corrector, node, parent, new_source)
@@ -125,9 +124,7 @@ def to_assignments(receiver, pairs)
 
             key = key.sym_type? && pair.colon? ? ":#{key.source}" : key.source
 
-            format(AREF_ASGN, receiver: receiver.source,
-                              key: key,
-                              value: value.source)
+            format(AREF_ASGN, receiver: receiver.source, key: key, value: value.source)
           end
         end
 

diff --git a/...p/cop/performance/redundant_sort_block.rb → ...p/cop/performance/redundant_sort_block.rb b/...p/cop/performance/redundant_sort_block.rb → ...p/cop/performance/redundant_sort_block.rb
@@ -16,25 +16,33 @@ class RedundantSortBlock < Base
         include SortBlock
         extend AutoCorrector
 
-        MSG = 'Use `sort` instead of `%<bad_method>s`.'
+        MSG = 'Use `sort` without block.'
 
         def on_block(node)
           return unless (send, var_a, var_b, body = sort_with_block?(node))
 
           replaceable_body?(body, var_a, var_b) do
-            range = sort_range(send, node)
+            register_offense(send, node)
+          end
+        end
+
+        def on_numblock(node)
+          return unless (send, arg_count, body = sort_with_numblock?(node))
+          return unless arg_count == 2
 
-            add_offense(range, message: message(var_a, var_b)) do |corrector|
-              corrector.replace(range, 'sort')
-            end
+          replaceable_body?(body, :_1, :_2) do
+            register_offense(send, node)
           end
         end
 
         private
 
-        def message(var_a, var_b)
-          bad_method = "sort { |#{var_a}, #{var_b}| #{var_a} <=> #{var_b} }"
-          format(MSG, bad_method: bad_method)
+        def register_offense(send, node)
+          range = sort_range(send, node)
+
+          add_offense(range) do |corrector|
+            corrector.replace(range, 'sort')
+          end
         end
       end
     end

diff --git a/...rmance/redundant_split_regexp_argument.rb → ...rmance/redundant_split_regexp_argument.rb b/...rmance/redundant_split_regexp_argument.rb → ...rmance/redundant_split_regexp_argument.rb
diff --git a/...cop/performance/redundant_string_chars.rb → ...cop/performance/redundant_string_chars.rb b/...cop/performance/redundant_string_chars.rb → ...cop/performance/redundant_string_chars.rb
diff --git a/...b/rubocop/cop/performance/regexp_match.rb → ...b/rubocop/cop/performance/regexp_match.rb b/...b/rubocop/cop/performance/regexp_match.rb → ...b/rubocop/cop/performance/regexp_match.rb
@@ -217,8 +217,7 @@ def modifier_form?(match_node)
         def find_last_match(body, range, scope_root)
           last_matches(body).find do |ref|
             ref_pos = ref.loc.expression.begin_pos
-            range.cover?(ref_pos) &&
-              scope_root(ref) == scope_root
+            range.cover?(ref_pos) && scope_root(ref) == scope_root
           end
         end
 
@@ -241,14 +240,7 @@ def scope_root(node)
         end
 
         def match_gvar?(sym)
-          %i[
-            $~
-            $MATCH
-            $PREMATCH
-            $POSTMATCH
-            $LAST_PAREN_MATCH
-            $LAST_MATCH_INFO
-          ].include?(sym)
+          %i[$~ $MATCH $PREMATCH $POSTMATCH $LAST_PAREN_MATCH $LAST_MATCH_INFO].include?(sym)
         end
 
         def correct_operator(corrector, recv, arg, oper = nil)

diff --git a/...b/rubocop/cop/performance/reverse_each.rb → ...b/rubocop/cop/performance/reverse_each.rb b/...b/rubocop/cop/performance/reverse_each.rb → ...b/rubocop/cop/performance/reverse_each.rb
diff --git a/.../rubocop/cop/performance/reverse_first.rb → .../rubocop/cop/performance/reverse_first.rb b/.../rubocop/cop/performance/reverse_first.rb → .../rubocop/cop/performance/reverse_first.rb
diff --git a/...lib/rubocop/cop/performance/select_map.rb → ...lib/rubocop/cop/performance/select_map.rb b/...lib/rubocop/cop/performance/select_map.rb → ...lib/rubocop/cop/performance/select_map.rb
diff --git a/....14.3/lib/rubocop/cop/performance/size.rb → ....15.0/lib/rubocop/cop/performance/size.rb b/....14.3/lib/rubocop/cop/performance/size.rb → ....15.0/lib/rubocop/cop/performance/size.rb