Skip to content

Commit 2d40ad0

Browse files
eksperimentaljosevalim
authored andcommitted
Simplify Range's step error message (#10835)
1 parent 00d1bc6 commit 2d40ad0

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

lib/elixir/lib/calendar/date.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ defmodule Date do
133133
step
134134
) do
135135
raise ArgumentError,
136-
"both dates must have matching calendar and the step must be an integer " <>
137-
"different than zero, got: #{inspect(first)}, #{inspect(last)}, #{step}"
136+
"both dates must have matching calendar and the step must be a " <>
137+
"non-zero integer, got: #{inspect(first)}, #{inspect(last)}, #{step}"
138138
end
139139

140140
defp range(first, first_days, last, last_days, calendar, step) do

lib/elixir/lib/kernel.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3755,7 +3755,7 @@ defmodule Kernel do
37553755
defp validate_step!(step)
37563756
when is_float(step) or is_atom(step) or is_binary(step) or is_list(step) or step == 0 do
37573757
raise ArgumentError,
3758-
"ranges (first..last//step) expect the step to be an integer different than zero, " <>
3758+
"ranges (first..last//step) expect the step to be a non-zero integer, " <>
37593759
"got: #{Macro.to_string(step)}"
37603760
end
37613761

lib/elixir/lib/range.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ defmodule Range do
146146

147147
def new(first, last, step) do
148148
raise ArgumentError,
149-
"ranges (first..last//step) expect both sides to be integers and the step to be an integer " <>
150-
"different than zero, got: #{inspect(first)}..#{inspect(last)}//#{inspect(step)}"
149+
"ranges (first..last//step) expect both sides to be integers and the step to be a " <>
150+
"non-zero integer, got: #{inspect(first)}..#{inspect(last)}//#{inspect(step)}"
151151
end
152152

153153
@doc """

lib/elixir/test/elixir/calendar/date_range_test.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,14 @@ defmodule Date.RangeTest do
128128

129129
test "step is a non-zero integer" do
130130
step = 1.0
131-
message = ~r"the step must be an integer different than zero"
131+
message = ~r"the step must be a non-zero integer"
132132

133133
assert_raise ArgumentError, message, fn ->
134134
Date.range(~D[2000-01-01], ~D[2000-01-31], step)
135135
end
136136

137137
step = 0
138-
message = ~r"the step must be an integer different than zero"
138+
message = ~r"the step must be a non-zero integer"
139139

140140
assert_raise ArgumentError, message, fn ->
141141
Date.range(~D[2000-01-01], ~D[2000-01-31], step)

lib/elixir/test/elixir/range_test.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ defmodule RangeTest do
6262

6363
test "step is a non-zero integer" do
6464
step = 1.0
65-
message = ~r"the step to be an integer different than zero"
65+
message = ~r"the step to be a non-zero integer"
6666
assert_raise ArgumentError, message, fn -> 1..3//step end
6767

6868
step = 0
69-
message = ~r"the step to be an integer different than zero"
69+
message = ~r"the step to be a non-zero integer"
7070
assert_raise ArgumentError, message, fn -> 1..3//step end
7171
end
7272

0 commit comments

Comments
 (0)