[gentoo-commits] repo/gentoo:master commit in: dev-lang/elixir/, dev-lang/elixir/files/

[Joonas Niilola]

commit:     0d99596c0a071d08e4415e21d2111aae62f6b1e5
Author:     Jan Smutny <js <AT> excello <DOT> cz>
AuthorDate: Sat Oct 30 19:08:55 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 14:03:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d99596c

dev-lang/elixir: revision bump of 1.11.4 to r1

Add patches for compatibility with OPT-24.
Update 1.11.4 DEPEND - block >=OTP-24 because of incompatibility.

Signed-off-by: Jan Smutný <smutnja3 <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 ...lixir-1.11.4.ebuild => elixir-1.11.4-r1.ebuild} |   3 +
 dev-lang/elixir/elixir-1.11.4.ebuild               |   1 +
 .../files/elixir-1.11.4-fix-elixir-test.patch      |  33 ++++++
 ...4-fix-logger-translator-with-otp-24-11222.patch |  64 +++++++++++
 ...11.4-update-warnings-for-OTP-master-10807.patch | 125 +++++++++++++++++++++
 5 files changed, 226 insertions(+)

diff --git a/dev-lang/elixir/elixir-1.11.4.ebuild b/dev-lang/elixir/elixir-1.11.4-r1.ebuild
similarity index 84%
copy from dev-lang/elixir/elixir-1.11.4.ebuild
copy to dev-lang/elixir/elixir-1.11.4-r1.ebuild
index cdae3d8bbe4b..f9c33ae96695 100644
--- a/dev-lang/elixir/elixir-1.11.4.ebuild
+++ b/dev-lang/elixir/elixir-1.11.4-r1.ebuild
@@ -30,6 +30,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.10.3-no-Q.patch
 	"${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch
 	"${FILESDIR}"/${PN}-1.11.2-mksh.patch
+	"${FILESDIR}"/${P}-fix-elixir-test.patch
+	"${FILESDIR}"/${P}-update-warnings-for-OTP-master-10807.patch
+	"${FILESDIR}"/${P}-fix-logger-translator-with-otp-24-11222.patch
 )
 
 src_install() {

diff --git a/dev-lang/elixir/elixir-1.11.4.ebuild b/dev-lang/elixir/elixir-1.11.4.ebuild
index cdae3d8bbe4b..f5439a725a0a 100644
--- a/dev-lang/elixir/elixir-1.11.4.ebuild
+++ b/dev-lang/elixir/elixir-1.11.4.ebuild
@@ -16,6 +16,7 @@ RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-lang/erlang-21:0=[ssl]
+	<dev-lang/erlang-24
 "
 # 'mix' tool collides with sci-biology/phylip, bug #537514
 RDEPEND="${DEPEND}

diff --git a/dev-lang/elixir/files/elixir-1.11.4-fix-elixir-test.patch b/dev-lang/elixir/files/elixir-1.11.4-fix-elixir-test.patch
new file mode 100644
index 000000000000..6b4dd0c3939b
--- /dev/null
+++ b/dev-lang/elixir/files/elixir-1.11.4-fix-elixir-test.patch
@@ -0,0 +1,33 @@
+From 3e88b1f336f843378790802bd486f6793b7ef872 Mon Sep 17 00:00:00 2001
+From: Jan Smutny <js@×××××××.cz>
+Date: Thu, 14 Oct 2021 16:14:55 +0200
+Subject: [PATCH] Fix elixir test assertion for erlang >=OTP-24.1
+
+---
+ lib/elixir/test/elixir/exception_test.exs | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/lib/elixir/test/elixir/exception_test.exs b/lib/elixir/test/elixir/exception_test.exs
+index df9d46bbc..ae08d5185 100644
+--- a/lib/elixir/test/elixir/exception_test.exs
++++ b/lib/elixir/test/elixir/exception_test.exs
+@@ -446,11 +446,12 @@ test "annotates undefined function error with suggestions" do
+                    * min/1
+              """
+ 
+-      assert blame_message(:erlang, & &1.gt_cookie()) == """
+-             function :erlang.gt_cookie/0 is undefined or private. Did you mean one of:
++      assert blame_message(:erlang, & &1.hal()) == """
++             function :erlang.hal/0 is undefined or private. Did you mean one of:
+ 
+-                   * get_cookie/0
+-                   * set_cookie/2
++                   * halt/0
++                   * halt/1
++                   * halt/2
+              """
+     end
+ 
+-- 
+2.31.1
+

diff --git a/dev-lang/elixir/files/elixir-1.11.4-fix-logger-translator-with-otp-24-11222.patch b/dev-lang/elixir/files/elixir-1.11.4-fix-logger-translator-with-otp-24-11222.patch
new file mode 100644
index 000000000000..428e7ceb3ab4
--- /dev/null
+++ b/dev-lang/elixir/files/elixir-1.11.4-fix-logger-translator-with-otp-24-11222.patch
@@ -0,0 +1,64 @@
+From b1492cb0cfa689c4c098761a375d5cb728d3c175 Mon Sep 17 00:00:00 2001
+From: Matteo <mbrancaleoni@×××××.com>
+Date: Tue, 31 Aug 2021 23:46:27 +0200
+Subject: [PATCH 3/3] Fix logger translator with otp-24  (#11222)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Handle new significant key in sasl reports
+
+* Add OTP-24.0 to CI matrix
+
+Co-authored-by: José Valim <jose.valim@×××××××.co>
+---
+ .github/workflows/ci.yml            |  2 +-
+ lib/logger/lib/logger/translator.ex | 13 ++++++++++---
+ 2 files changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
+index f43a9ff62..a4bc8dbeb 100644
+--- a/.github/workflows/ci.yml
++++ b/.github/workflows/ci.yml
+@@ -15,7 +15,7 @@ jobs:
+     strategy:
+       fail-fast: false
+       matrix:
+-        otp_release: ['OTP-23.0', 'OTP-22.3', 'OTP-22.0', 'OTP-21.3.8', 'OTP-21.0']
++        otp_release: ['OTP-24.0', 'OTP-23.0', 'OTP-22.3', 'OTP-22.0', 'OTP-21.3.8', 'OTP-21.0']
+         development: [false]
+         include:
+           - otp_release: master
+diff --git a/lib/logger/lib/logger/translator.ex b/lib/logger/lib/logger/translator.ex
+index d1d7e62f1..8afd79436 100644
+--- a/lib/logger/lib/logger/translator.ex
++++ b/lib/logger/lib/logger/translator.ex
+@@ -357,15 +357,22 @@ defp child_info(_min_level, _child) do
+     []
+   end
+ 
+-  defp child_debug(:debug, restart_type: restart, shutdown: shutdown, child_type: type) do
+-    ["\nRestart: ", inspect(restart), "\nShutdown: ", inspect(shutdown)] ++
+-      ["\nType: ", inspect(type)]
++  defp child_debug(:debug, opts) do
++    for {key, value} <- opts do
++      child_debug_key(key, value)
++    end
+   end
+ 
+   defp child_debug(_min_level, _child) do
+     []
+   end
+ 
++  defp child_debug_key(:restart_type, value), do: ["\nRestart: " | inspect(value)]
++  defp child_debug_key(:shutdown, value), do: ["\nShutdown: " | inspect(value)]
++  defp child_debug_key(:child_type, value), do: ["\nType: " | inspect(value)]
++  defp child_debug_key(:significant, value), do: if(value, do: "\nSignificant: true", else: [])
++  defp child_debug_key(_, _), do: []
++
+   defp report_crash(min_level, [[{:initial_call, initial_call} | crashed], linked]) do
+     mfa = initial_call_to_mfa(initial_call)
+     report_crash(min_level, crashed, [{:initial_call, mfa}], linked)
+-- 
+2.31.1
+

diff --git a/dev-lang/elixir/files/elixir-1.11.4-update-warnings-for-OTP-master-10807.patch b/dev-lang/elixir/files/elixir-1.11.4-update-warnings-for-OTP-master-10807.patch
new file mode 100644
index 000000000000..2cc0b217cbb1
--- /dev/null
+++ b/dev-lang/elixir/files/elixir-1.11.4-update-warnings-for-OTP-master-10807.patch
@@ -0,0 +1,125 @@
+From 237a71311c5ae4fc5dd3c7a590a7b6dab97a664a Mon Sep 17 00:00:00 2001
+From: Wojtek Mach <wojtekmach@××××××××××××××××××××.com>
+Date: Tue, 23 Mar 2021 17:40:04 +0100
+Subject: [PATCH 2/3] Update warnings for OTP master (#10807)
+
+---
+ lib/elixir/src/elixir_erl_compiler.erl        | 34 ++++++++++++-------
+ .../test/elixir/kernel/warning_test.exs       | 25 --------------
+ 2 files changed, 21 insertions(+), 38 deletions(-)
+
+diff --git a/lib/elixir/src/elixir_erl_compiler.erl b/lib/elixir/src/elixir_erl_compiler.erl
+index 7010b59fd..e0aa05114 100644
+--- a/lib/elixir/src/elixir_erl_compiler.erl
++++ b/lib/elixir/src/elixir_erl_compiler.erl
+@@ -94,6 +94,8 @@ handle_file_warning(true, _File, {_Line, sys_core_fold, {nomatch_shadow, _}}) ->
+ 
+ %% Those we implement ourselves
+ handle_file_warning(_, _File, {_Line, v3_core, {map_key_repeated, _}}) -> ok;
++handle_file_warning(_, _File, {_Line, sys_core_fold, {ignored, useless_building}}) -> ok;
++%% TODO: remove when we require Erlang/OTP 24
+ handle_file_warning(_, _File, {_Line, sys_core_fold, useless_building}) -> ok;
+ 
+ %% Ignore all linting errors (only come up on parse transforms)
+@@ -112,11 +114,11 @@ handle_file_error(File, {Line, Module, Desc}) ->
+   elixir_errors:compile_error([{line, Line}], File, Message).
+ 
+ %% Mention the capture operator in make_fun
+-custom_format(sys_core_fold, {no_effect, {erlang, make_fun, 3}}) ->
++custom_format(sys_core_fold, {ignored, {no_effect, {erlang, make_fun, 3}}}) ->
+   "the result of the capture operator & (:erlang.make_fun/3) is never used";
+ 
+ %% Make no_effect clauses pretty
+-custom_format(sys_core_fold, {no_effect, {erlang, F, A}}) ->
++custom_format(sys_core_fold, {ignored, {no_effect, {erlang, F, A}}}) ->
+   {Fmt, Args} = case erl_internal:comp_op(F, A) of
+     true -> {"use of operator ~ts has no effect", [elixir_utils:erlang_comparison_op_to_elixir(F)]};
+     false ->
+@@ -127,12 +129,20 @@ custom_format(sys_core_fold, {no_effect, {erlang, F, A}}) ->
+   end,
+   io_lib:format(Fmt, Args);
+ 
+-%% Rewrite nomatch_guard to be more generic it can happen inside if, unless, and the like
+-custom_format(sys_core_fold, nomatch_guard) ->
++%% Rewrite nomatch to be more generic, it can happen inside if, unless, and the like
++custom_format(sys_core_fold, {nomatch, X}) when X == guard; X == no_clause ->
+   "this check/guard will always yield the same result";
+ 
++custom_format(sys_core_fold, {nomatch, {shadow, Line, {ErlName, ErlArity}}}) ->
++  {Name, Arity} = elixir_utils:erl_fa_to_elixir_fa(ErlName, ErlArity),
++
++  io_lib:format(
++    "this clause for ~ts/~B cannot match because a previous clause at line ~B always matches",
++    [Name, Arity, Line]
++  );
++
+ %% Handle literal eval failures
+-custom_format(sys_core_fold, {eval_failure, {Mod, Name, Arity}, Error}) ->
++custom_format(sys_core_fold, {failed, {eval_failure, {Mod, Name, Arity}, Error}}) ->
+   #{'__struct__' := Struct} = 'Elixir.Exception':normalize(error, Error),
+   {ExMod, ExName, ExArgs} = elixir_rewrite:erl_to_ex(Mod, Name, lists:duplicate(Arity, nil)),
+   Call = 'Elixir.Exception':format_mfa(ExMod, ExName, length(ExArgs)),
+@@ -143,18 +153,16 @@ custom_format(sys_core_fold, {eval_failure, {Mod, Name, Arity}, Error}) ->
+   ["the call to ", Trimmed, " will fail with ", elixir_aliases:inspect(Struct)];
+ 
+ %% TODO: remove when we require OTP 24
++custom_format(sys_core_fold, {nomatch_shadow, Line, FA}) ->
++  custom_format(sys_core_fold, {nomatch, {shadow, Line, FA}});
++custom_format(sys_core_fold, nomatch_guard) ->
++  custom_format(sys_core_fold, {nomatch, guard});
++custom_format(sys_core_fold, {no_effect, X}) ->
++  custom_format(sys_core_fold, {ignored, {no_effect, X}});
+ custom_format(sys_core_fold, {eval_failure, Error}) ->
+   #{'__struct__' := Struct} = 'Elixir.Exception':normalize(error, Error),
+   ["this expression will fail with ", elixir_aliases:inspect(Struct)];
+ 
+-custom_format(sys_core_fold, {nomatch_shadow,Line,{ErlName,ErlArity}}) ->
+-  {Name, Arity} = elixir_utils:erl_fa_to_elixir_fa(ErlName, ErlArity),
+-
+-  io_lib:format(
+-    "this clause for ~ts/~B cannot match because a previous clause at line ~B always matches",
+-    [Name, Arity, Line]
+-  );
+-
+ custom_format([], Desc) ->
+   io_lib:format("~p", [Desc]);
+ 
+diff --git a/lib/elixir/test/elixir/kernel/warning_test.exs b/lib/elixir/test/elixir/kernel/warning_test.exs
+index 15a984a54..37334ff65 100644
+--- a/lib/elixir/test/elixir/kernel/warning_test.exs
++++ b/lib/elixir/test/elixir/kernel/warning_test.exs
+@@ -1154,31 +1154,6 @@ def foo(x), do: :ok
+     purge(Sample)
+   end
+ 
+-  test "with and do clauses emit errors, else clauses do not" do
+-    assert capture_err(fn ->
+-             Code.compile_string("""
+-             with {:first, int} when is_integer(int) <- {:second, Integer.gcd(2, 4)} do
+-               int
+-             end
+-             """)
+-           end) =~ "this clause cannot match"
+-
+-    assert capture_err(fn ->
+-             Code.compile_string("""
+-             with {:first, int1} when is_integer(int1) <- {:first, Integer.gcd(2, 4)},
+-                  {:second, int2} when is_integer(int2) <- {:second, Integer.gcd(2, 4)} do
+-               {:ok, int1 + int2}
+-             else
+-               {:first, nil} -> {:error, "first number is not integer"}
+-               {:second, nil} -> {:error, "second number is not integer"}
+-             end
+-             """)
+-           end) == ""
+-  after
+-    purge(Sample1)
+-    purge(Sample2)
+-  end
+-
+   test "warning on code point escape" do
+     assert capture_err(fn ->
+              Code.eval_string("? ")
+-- 
+2.31.1
+