Skip to content

Commit 13dde55

Browse files
committed
Fix more tests
1 parent eaf62c5 commit 13dde55

File tree

5 files changed

+6
-15
lines changed

5 files changed

+6
-15
lines changed

lib/elixir/lib/calendar/time.ex

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -797,15 +797,8 @@ defmodule Time do
797797
@doc since: "1.5.0"
798798
@spec convert!(Calendar.time(), Calendar.calendar()) :: t
799799
def convert!(time, calendar) do
800-
case convert(time, calendar) do
801-
{:ok, value} ->
802-
value
803-
804-
{:error, reason} ->
805-
raise ArgumentError,
806-
"cannot convert #{inspect(time)} to target calendar #{inspect(calendar)}, " <>
807-
"reason: #{inspect(reason)}"
808-
end
800+
{:ok, value} = convert(time, calendar)
801+
value
809802
end
810803

811804
@doc """

lib/elixir/lib/kernel.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ defmodule Kernel do
302302
@compile {:inline, bootstrapped?: 1}
303303
case :code.ensure_loaded(Kernel) do
304304
{:module, _} ->
305-
defp bootstrapped?(_), do: true
305+
defp bootstrapped?(module), do: is_atom(module)
306306

307307
{:error, _} ->
308308
defp bootstrapped?(module), do: :code.ensure_loaded(module) == {:module, module}

lib/elixir/lib/set.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ defmodule Set do
9090
if target1 == target2 do
9191
target1.intersection(set1, set2)
9292
else
93-
Enumerable.reduce(set1, {:cont, target1.new}, fn v, acc ->
93+
Enumerable.reduce(set1, {:cont, target1.new()}, fn v, acc ->
9494
{:cont, if(target2.member?(set2, v), do: target1.put(acc, v), else: acc)}
9595
end)
9696
|> elem(1)

lib/elixir/src/elixir_locals.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ ensure_no_undefined_local(Module, All, E) ->
106106

107107
warn_unused_local(Module, All, Private, E) ->
108108
if_tracker(Module, [], fun(Tracker) ->
109-
{_Unreachable, Warnings} = ?locals:collect_unused_locals(Tracker, All, Private),
109+
{Unreachable, Warnings} = ?locals:collect_unused_locals(Tracker, All, Private),
110110
[elixir_errors:file_warn(Meta, E, ?MODULE, Error) || {Meta, Error} <- Warnings],
111-
[]
111+
Unreachable
112112
end).
113113

114114
format_error({function_conflict, {Receiver, {Name, Arity}}}) ->

lib/elixir/test/elixir/kernel/quote_test.exs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,6 @@ defmodule Kernel.QuoteTest.ErrorsTest do
383383
mod = Kernel.QuoteTest.ErrorsTest
384384
file = __ENV__.file |> Path.relative_to_cwd() |> String.to_charlist()
385385
assert [{^mod, :will_raise, 2, [file: ^file, line: @line] ++ _} | _] = __STACKTRACE__
386-
else
387-
_ -> flunk("expected failure")
388386
end
389387
end
390388

0 commit comments

Comments
 (0)