Skip to content

Return if_none for invalid offsets in Indexable#find [fixup #15552] #15589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
straight-shoota merged 2 commits into from
Mar 25, 2025
Merged

Return if_none for invalid offsets in Indexable#find [fixup #15552] #15589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db39a02
Return `if_none` for invalid offsets in `Indexable#find`
Sija Mar 23, 2025
d6de578
Fix specs
Sija Mar 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions spec/std/indexable_spec.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ describe Indexable do
indexable.find(offset: -6) { |i| i.even? }.should eq 2
end

it "does not receive a valid negative offset, returns nil" do
it "does not receive a valid negative offset, returns if_none value" do
indexable = SafeIndexable.new(4)
indexable.find(offset: -10) { |i| i > 2 }.should be_nil
indexable.find(-1, offset: -10) { |i| i > 2 }.should eq -1
end

it "does not find the element matching the block" do
Expand Down
2 changes: 1 addition & 1 deletion src/indexable.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ module Indexable(T)
# ```
def find(if_none = nil, offset : Int = 0, & : T ->)
offset += size if offset < 0
return nil if offset < 0
return if_none if offset < 0

if idx = index(offset) { |i| yield i }
return unsafe_fetch(idx)
Expand Down