Skip to content

Commit 7995bb5

Browse files
Lillian ZhangNicolas Laurent
authored andcommitted
Array specs: remove extraneous nil during range creation
1 parent d2c7dd7 commit 7995bb5

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

spec/ruby/core/array/fill_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,8 @@ def obj.<=>(rhs); rhs == self ? 0 : nil end
327327

328328
ruby_version_is "2.7" do
329329
it "works with beginless ranges" do
330-
[1, 2, 3, 4].fill('x', eval("(nil..2)")).should == ["x", "x", "x", 4]
331-
[1, 2, 3, 4].fill(eval("(nil...2)")) { |x| x + 2 }.should == [2, 3, 3, 4]
330+
[1, 2, 3, 4].fill('x', eval("(..2)")).should == ["x", "x", "x", 4]
331+
[1, 2, 3, 4].fill(eval("(...2)")) { |x| x + 2 }.should == [2, 3, 3, 4]
332332
end
333333
end
334334
end

spec/ruby/core/array/shared/slice.rb

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -524,30 +524,30 @@ def to.to_int() -2 end
524524
ruby_version_is "2.6" do
525525
it "can accept endless ranges" do
526526
a = [0, 1, 2, 3, 4, 5]
527-
a.send(@method, eval("(2..nil)")).should == [2, 3, 4, 5]
528-
a.send(@method, eval("(2...nil)")).should == [2, 3, 4, 5]
529-
a.send(@method, eval("(-2..nil)")).should == [4, 5]
530-
a.send(@method, eval("(-2...nil)")).should == [4, 5]
531-
a.send(@method, eval("(9..nil)")).should == nil
532-
a.send(@method, eval("(9...nil)")).should == nil
533-
a.send(@method, eval("(-9..nil)")).should == nil
534-
a.send(@method, eval("(-9...nil)")).should == nil
527+
a.send(@method, eval("(2..)")).should == [2, 3, 4, 5]
528+
a.send(@method, eval("(2...)")).should == [2, 3, 4, 5]
529+
a.send(@method, eval("(-2..)")).should == [4, 5]
530+
a.send(@method, eval("(-2...)")).should == [4, 5]
531+
a.send(@method, eval("(9..)")).should == nil
532+
a.send(@method, eval("(9...)")).should == nil
533+
a.send(@method, eval("(-9..)")).should == nil
534+
a.send(@method, eval("(-9...)")).should == nil
535535
end
536536
end
537537

538538
ruby_version_is "2.7" do
539539
it "can accept beginless ranges" do
540540
a = [0, 1, 2, 3, 4, 5]
541-
a.send(@method, eval("(nil..3)")).should == [0, 1, 2, 3]
542-
a.send(@method, eval("(nil...3)")).should == [0, 1, 2]
543-
a.send(@method, eval("(nil..-3)")).should == [0, 1, 2, 3]
544-
a.send(@method, eval("(nil...-3)")).should == [0, 1, 2]
545-
a.send(@method, eval("(nil..0)")).should == [0]
546-
a.send(@method, eval("(nil...0)")).should == []
547-
a.send(@method, eval("(nil..9)")).should == [0, 1, 2, 3, 4, 5]
548-
a.send(@method, eval("(nil...9)")).should == [0, 1, 2, 3, 4, 5]
549-
a.send(@method, eval("(nil..-9)")).should == []
550-
a.send(@method, eval("(nil...-9)")).should == []
541+
a.send(@method, eval("(..3)")).should == [0, 1, 2, 3]
542+
a.send(@method, eval("(...3)")).should == [0, 1, 2]
543+
a.send(@method, eval("(..-3)")).should == [0, 1, 2, 3]
544+
a.send(@method, eval("(...-3)")).should == [0, 1, 2]
545+
a.send(@method, eval("(..0)")).should == [0]
546+
a.send(@method, eval("(...0)")).should == []
547+
a.send(@method, eval("(..9)")).should == [0, 1, 2, 3, 4, 5]
548+
a.send(@method, eval("(...9)")).should == [0, 1, 2, 3, 4, 5]
549+
a.send(@method, eval("(..-9)")).should == []
550+
a.send(@method, eval("(...-9)")).should == []
551551
end
552552

553553
it "can accept nil...nil ranges" do

spec/ruby/core/array/slice_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,11 @@ def to.to_int() -2 end
169169
ruby_version_is "2.7" do
170170
it "works with beginless ranges" do
171171
a = [0,1,2,3,4]
172-
a.slice!(eval("(nil..3)")).should == [0, 1, 2, 3]
172+
a.slice!(eval("(..3)")).should == [0, 1, 2, 3]
173173
a.should == [4]
174174

175175
a = [0,1,2,3,4]
176-
a.slice!(eval("(nil...-2)")).should == [0, 1, 2]
176+
a.slice!(eval("(...-2)")).should == [0, 1, 2]
177177
a.should == [3, 4]
178178
end
179179
end

spec/ruby/core/array/values_at_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ def to.to_int() -2 end
7070

7171
ruby_version_is "2.7" do
7272
it "works when given beginless ranges" do
73-
[1, 2, 3, 4].values_at(eval("(nil..2)")).should == [1, 2, 3]
74-
[1, 2, 3, 4].values_at(eval("(nil...2)")).should == [1, 2]
73+
[1, 2, 3, 4].values_at(eval("(..2)")).should == [1, 2, 3]
74+
[1, 2, 3, 4].values_at(eval("(...2)")).should == [1, 2]
7575
end
7676
end
7777
end

0 commit comments

Comments
 (0)