Skip to content

Commit

Permalink
Merge pull request #854 from artichoke/dependabot/bundler/rubocop-0.91.1
Browse files Browse the repository at this point in the history
Bump rubocop from 0.90.0 to 0.91.1
  • Loading branch information
lopopolo committed Sep 24, 2020
2 parents 3182714 + ccc6b49 commit f05cc4d
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
source 'https://rubygems.org'

gem 'rake', '>= 12.3.3', require: false
gem 'rubocop', '~> 0.90', require: false
gem 'rubocop', '~> 0.91', require: false
gem 'rubocop-rake', '~> 0.5', require: false
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ GEM
ast (~> 2.4.1)
rainbow (3.0.0)
rake (13.0.1)
regexp_parser (1.7.1)
regexp_parser (1.8.0)
rexml (3.2.4)
rubocop (0.90.0)
rubocop (0.91.1)
parallel (~> 1.10)
parser (>= 2.7.1.1)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7)
rexml
rubocop-ast (>= 0.3.0, < 1.0)
rubocop-ast (>= 0.4.0, < 1.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.3.0)
rubocop-ast (0.4.2)
parser (>= 2.7.1.4)
rubocop-rake (0.5.1)
rubocop
Expand All @@ -30,7 +30,7 @@ PLATFORMS

DEPENDENCIES
rake (>= 12.3.3)
rubocop (~> 0.90)
rubocop (~> 0.91)
rubocop-rake (~> 0.5)

BUNDLED WITH
Expand Down
4 changes: 2 additions & 2 deletions artichoke-backend/src/extn/core/array/array.rb
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ def concat(*args)
if other.is_a?(Array)
other
elsif other.respond_to?(:to_ary)
other = other.to_ary # rubocop:disable Style/RedundantSelfAssignment
other = other.to_ary
unless other.is_a?(Array)
raise TypeError, "can't convert #{classname} to Array (#{classname}#to_ary gives #{other.class})"
end
Expand Down Expand Up @@ -1135,7 +1135,7 @@ def replace(other)
if other.is_a?(Array)
other
elsif other.respond_to?(:to_ary)
other = other.to_ary # rubocop:disable Style/RedundantSelfAssignment
other = other.to_ary
unless other.is_a?(Array)
raise TypeError, "can't convert #{classname} to Array (#{classname}#to_ary gives #{other.class})"
end
Expand Down
16 changes: 8 additions & 8 deletions artichoke-backend/src/extn/core/range/range.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ def cover?(*args)
return true if cmp_end >= 0

val_max = begin
val.max
rescue StandardError
nil
end
val.max
rescue StandardError
nil
end
return false if val_max.nil?

return (range_end <=> val_max) >= 0
Expand All @@ -39,10 +39,10 @@ def cover?(*args)
return false if cmp_begin.nil? || cmp_begin.negative?

max = begin
self.max
rescue StandardError
nil
end
self.max
rescue StandardError
nil
end
cmp_max = val <=> max
cmp_end = val <=> range_end

Expand Down

0 comments on commit f05cc4d

Please sign in to comment.