Merge pull request #6869 from Homebrew/dependabot/bundler/Library/Homebrew/rubocop-performance-1.5.2

build: bump rubocop-performance from 1.5.1 to 1.5.2 in /Library/Homebrew
This commit is contained in:
Mike McQuaid 2019-12-26 11:49:46 +00:00 committed by GitHub
commit 53e523f72a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 7 additions and 6 deletions

View File

@ -87,7 +87,7 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-performance (1.5.1)
rubocop-performance (1.5.2)
rubocop (>= 0.71.0)
rubocop-rspec (1.37.1)
rubocop (>= 0.68.1)

View File

@ -62,6 +62,6 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-wait-0.0.9/lib"
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-progressbar-1.10.1/lib"
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unicode-display_width-1.6.0/lib"
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.78.0/lib"
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-performance-1.5.1/lib"
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-performance-1.5.2/lib"
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rspec-1.37.1/lib"
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-macho-2.2.0/lib"

View File

@ -32,11 +32,11 @@ module RuboCop
# make `count` work with a block is to call `to_a.count {...}`.
#
# Example:
# Model.where(id: [1, 2, 3].select { |m| m.method == true }.size
# `Model.where(id: [1, 2, 3]).select { |m| m.method == true }.size`
#
# becomes:
#
# Model.where(id: [1, 2, 3]).to_a.count { |m| m.method == true }
# `Model.where(id: [1, 2, 3]).to_a.count { |m| m.method == true }`
class Count < Cop
include RangeHelp

View File

@ -65,7 +65,8 @@ module RuboCop
end
def non_redundant_merge?(node, receiver, pairs)
non_redundant_pairs?(receiver, pairs) ||
pairs.empty? ||
non_redundant_pairs?(receiver, pairs) ||
kwsplat_used?(pairs) ||
non_redundant_value_used?(receiver, node)
end