summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2015-09-28 22:57:32 +0200
committerJosé Valim <jose.valim@plataformatec.com.br>2015-09-28 22:57:32 +0200
commit30281d149a38a8a1b60ef98fc8977bc8e33c9e92 (patch)
tree481d1fe4d276c0d0fbe70ac497fb56efca7db8b5
parent81503c0a917f578e619e7bca6e63c48ddae5cdcf (diff)
downloadelixir-30281d149a38a8a1b60ef98fc8977bc8e33c9e92.tar.gz
Fix failing tests
-rw-r--r--lib/elixir/lib/enum.ex8
-rw-r--r--lib/elixir/lib/range.ex6
2 files changed, 9 insertions, 5 deletions
diff --git a/lib/elixir/lib/enum.ex b/lib/elixir/lib/enum.ex
index 3ca01d5c1..28d669d8b 100644
--- a/lib/elixir/lib/enum.ex
+++ b/lib/elixir/lib/enum.ex
@@ -510,7 +510,7 @@ defmodule Enum do
## Examples
iex> Enum.dedup_by([{1, :a}, {2, :b}, {2, :c}, {1, :a}], fn {x, _} -> x end)
- [{1, :x}, {2, :y}, {1, :a}]
+ [{1, :a}, {2, :b}, {1, :a}]
iex> Enum.dedup_by([5, 1, 2, 3, 2, 1], fn x -> x > 2 end)
[5, 1, 3, 2]
@@ -1223,12 +1223,12 @@ defmodule Enum do
iex> Enum.member?(1..10, 5)
true
- ...> Enum.member?(1..10, 5.0)
+ iex> Enum.member?(1..10, 5.0)
false
iex> Enum.member?([1.0, 2.0, 3.0], 2)
false
- ...> Enum.member?([1.0, 2.0, 3.0], 2.000)
+ iex> Enum.member?([1.0, 2.0, 3.0], 2.000)
true
iex> Enum.member?([:a, :b, :c], :d)
@@ -1247,7 +1247,7 @@ defmodule Enum do
{:error, module} ->
module.reduce(enumerable, {:cont, false}, fn
v, _ when v === element -> {:halt, true}
- _, _ -> {:cont, false}
+ _, _ -> {:cont, false}
end) |> elem(1)
end
end
diff --git a/lib/elixir/lib/range.ex b/lib/elixir/lib/range.ex
index 1290ed24d..6420729b1 100644
--- a/lib/elixir/lib/range.ex
+++ b/lib/elixir/lib/range.ex
@@ -88,7 +88,7 @@ defimpl Enumerable, for: Range do
{:done, acc}
end
- def member?(first .. last, value) do
+ def member?(first .. last, value) when is_integer(value) do
if first <= last do
{:ok, first <= value and value <= last}
else
@@ -96,6 +96,10 @@ defimpl Enumerable, for: Range do
end
end
+ def member?(_ .. _, _value) do
+ {:ok, false}
+ end
+
def count(first .. last) do
if first <= last do
{:ok, last - first + 1}