Skip to content

Commit 5754da2

Browse files
author
José Valim
committed
Fixes for Erlang 19 RC
Signed-off-by: José Valim <jose.valim@plataformatec.com.br>
1 parent 41b5091 commit 5754da2

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

lib/elixir/lib/file/stream.ex

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ defmodule File.Stream do
2020
raw = :lists.keyfind(:encoding, 1, modes) == false
2121

2222
modes =
23-
if raw do
24-
if :lists.keyfind(:read_ahead, 1, modes) == {:read_ahead, false} do
25-
[:raw|modes]
26-
else
27-
[:raw, :read_ahead|modes]
28-
end
29-
else
30-
modes
23+
case raw do
24+
true ->
25+
if :lists.keyfind(:read_ahead, 1, modes) == {:read_ahead, false} do
26+
[:raw | modes]
27+
else
28+
[:raw, :read_ahead | modes]
29+
end
30+
false ->
31+
modes
3132
end
3233

3334
%File.Stream{path: path, modes: modes, raw: raw, line_or_bytes: line_or_bytes}

lib/elixir/lib/gen_event.ex

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,12 @@ defmodule GenEvent do
650650

651651
def init_it(starter, parent, name, _, _, options) do
652652
Process.put(:"$initial_call", {__MODULE__, :init_it, 6})
653-
debug = :gen.debug_options(options)
653+
debug =
654+
if function_exported?(:gen, :debug_options, 2) do
655+
:gen.debug_options(name, options)
656+
else
657+
:gen.debug_options(options)
658+
end
654659
:proc_lib.init_ack(starter, {:ok, self()})
655660
loop(parent, name(name), [], debug, false)
656661
end

0 commit comments

Comments
 (0)