Skip to content

Commit e9f305c

Browse files
committed
Fix typespecs and code comments
1 parent a0f0f75 commit e9f305c

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

lib/elixir/lib/kernel/parallel_compiler.ex

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,8 @@ defmodule Kernel.ParallelCompiler do
155155
"""
156156
@doc since: "1.6.0"
157157
@spec require([Path.t()], keyword()) ::
158-
{:ok, [atom], [warning] | info()} | {:error, [error], [warning] | info()}
158+
{:ok, [atom], [warning] | info()}
159+
| {:error, [error] | [Code.diagnostic(:error)], [warning] | info()}
159160
def require(files, options \\ []) when is_list(options) do
160161
spawn_workers(files, :require, options)
161162
end

lib/elixir/src/elixir.erl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ config_change(_Changed, _New, _Remove) ->
118118
ok.
119119

120120
set_stdio_and_stderr_to_binary_and_maybe_utf8() ->
121+
%% TODO: Remove me once we require Erlang/OTP 26+
121122
ok = io:setopts(standard_io, [binary, {encoding, utf8}]),
122123
ok = io:setopts(standard_error, [{encoding, utf8}]),
123124
ok.

0 commit comments

Comments
 (0)