summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@dashbit.co>2023-05-16 14:21:41 +0200
committerJosé Valim <jose.valim@dashbit.co>2023-05-16 14:21:41 +0200
commite9f305c56b72191a023022412b6689c9131d049a (patch)
tree52f5dd74ce39b742088be1056aaf948e140ddd47
parenta0f0f75ee86d01a7ccc7012a1e6cd3f019bd3d43 (diff)
downloadelixir-e9f305c56b72191a023022412b6689c9131d049a.tar.gz
Fix typespecs and code comments
-rw-r--r--lib/elixir/lib/kernel/parallel_compiler.ex3
-rw-r--r--lib/elixir/src/elixir.erl1
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/elixir/lib/kernel/parallel_compiler.ex b/lib/elixir/lib/kernel/parallel_compiler.ex
index a8491220c..a7a1b0670 100644
--- a/lib/elixir/lib/kernel/parallel_compiler.ex
+++ b/lib/elixir/lib/kernel/parallel_compiler.ex
@@ -155,7 +155,8 @@ defmodule Kernel.ParallelCompiler do
"""
@doc since: "1.6.0"
@spec require([Path.t()], keyword()) ::
- {:ok, [atom], [warning] | info()} | {:error, [error], [warning] | info()}
+ {:ok, [atom], [warning] | info()}
+ | {:error, [error] | [Code.diagnostic(:error)], [warning] | info()}
def require(files, options \\ []) when is_list(options) do
spawn_workers(files, :require, options)
end
diff --git a/lib/elixir/src/elixir.erl b/lib/elixir/src/elixir.erl
index 463f544e2..b2eca2c8c 100644
--- a/lib/elixir/src/elixir.erl
+++ b/lib/elixir/src/elixir.erl
@@ -118,6 +118,7 @@ config_change(_Changed, _New, _Remove) ->
ok.
set_stdio_and_stderr_to_binary_and_maybe_utf8() ->
+ %% TODO: Remove me once we require Erlang/OTP 26+
ok = io:setopts(standard_io, [binary, {encoding, utf8}]),
ok = io:setopts(standard_error, [{encoding, utf8}]),
ok.