Skip to content

Use ifnone in Enum.find for all collections #1654

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
josevalim merged 1 commit into from
Aug 26, 2013
Merged

Use ifnone in Enum.find for all collections #1654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 lib/elixir/lib/enum.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,8 @@ defmodule Enum do
end

def find(collection, ifnone, fun) do
Enumerable.reduce(collection, ifnone, fn(entry, _) ->
if fun.(entry), do: throw({ :enum_find, entry })
Enumerable.reduce(collection, ifnone, fn(entry, ifnone) ->
if fun.(entry), do: throw({ :enum_find, entry }), else: ifnone
end)
catch
{ :enum_find, entry } -> entry
Expand Down
2 changes: 2 additions & 0 deletions lib/elixir/test/elixir/enum_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,8 @@ defmodule EnumTest.Range do
range = Range.new(first: 2, last: 6)
assert Enum.find(range, fn(x) -> rem(x, 2) == 0 end) == 2
assert Enum.find(range, fn(x) -> rem(x, 2) == 1 end) == 3
assert Enum.find(range, fn _ -> false end) == nil
assert Enum.find(range, 0, fn _ -> false end) == 0
end

test :find_value do
Expand Down