File 1694-slave-deprecate-the-module-completely.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1694-slave-deprecate-the-module-completely.patch of Package erlang (Revision 803d29f7e9aa4c09100926e3598be691)

Currently displaying revision 803d29f7e9aa4c09100926e3598be691 , Show latest

From 04415034525f03e235f683f34a08c9b0eb815c9c Mon Sep 17 00:00:00 2001
From: Maxim Fedorov <maximfca@gmail.com>
Date: Sun, 29 Aug 2021 20:54:12 -0700
Subject: [PATCH 4/7] slave: deprecate the module completely

'slave' has been replaced with 'peer' for Common Test
purposes. Remaining uses (eunit and pool) will be
addressed separately.
---
 lib/common_test/src/test_server.erl      | 1 +
 lib/common_test/src/test_server_node.erl | 3 +++
 lib/eunit/src/eunit_data.erl             | 3 +++
 lib/kernel/src/net.erl                   | 4 +---
 lib/stdlib/src/otp_internal.erl          | 6 ++++--
 lib/stdlib/src/pool.erl                  | 2 ++
 lib/stdlib/src/slave.erl                 | 2 ++
 system/doc/general_info/DEPRECATIONS     | 5 +++++
 8 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/lib/common_test/src/test_server.erl b/lib/common_test/src/test_server.erl
index 26a94730c1..5a9b96aed6 100644
--- a/lib/common_test/src/test_server.erl
+++ b/lib/common_test/src/test_server.erl
@@ -2688,6 +2688,7 @@ wait_for_node(Slave) ->
     end,
     Result.
 
+-compile([{nowarn_deprecated_function, [{slave, stop, 1}]}]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% stop_node(Name) -> true|false
diff --git a/lib/common_test/src/test_server_node.erl b/lib/common_test/src/test_server_node.erl
index 349402fcca..0959624431 100644
--- a/lib/common_test/src/test_server_node.erl
+++ b/lib/common_test/src/test_server_node.erl
@@ -179,6 +179,9 @@ start_node_slave(SlaveName, OptList, From, _TI) ->
 	end,
     gen_server:reply(From,Ret).
 
+%% Temporary suppression, to avoid a warning calling undocumented
+%%  but deprecated function.
+-compile([{nowarn_deprecated_function,[{slave,start,5}]}]).
 
 do_start_node_slave(Host0, SlaveName, Args, Prog, Cleanup) ->
     Host =
diff --git a/lib/eunit/src/eunit_data.erl b/lib/eunit/src/eunit_data.erl
index a16faf2e80..c9dc184970 100644
--- a/lib/eunit/src/eunit_data.erl
+++ b/lib/eunit/src/eunit_data.erl
@@ -182,6 +182,9 @@ next(Tests) ->
 	    none
     end.
 
+%% Temporary suppression
+-compile([{nowarn_deprecated_function,[{slave,start_link,3},{slave,stop,1}]}]).
+
 %% this returns either a #test{} or #group{} record, or {data, T} to
 %% signal that T has been substituted for the given representation
 
diff --git a/lib/kernel/src/net.erl b/lib/kernel/src/net.erl
index 9acd89fb5a..1b6905df94 100644
--- a/lib/kernel/src/net.erl
+++ b/lib/kernel/src/net.erl
@@ -49,7 +49,6 @@
 	 cast/4,
 	 broadcast/3,
 	 ping/1,
-	 relay/1,
 	 sleep/1]).
 
 %% Should we define these here or refer to the prim_net module
@@ -73,7 +72,7 @@
 -deprecated({cast,      4, "use rpc:cast/4 instead"}).
 -deprecated({broadcast, 3, "use rpc:eval_everywhere/3 instead"}).
 -deprecated({ping,      1, "use net_adm:ping/1 instead"}).
--deprecated({relay,     1, "use slave:relay/1 instead"}).
+-removed({relay,        1, "use fun Relay(Pid) -> receive X -> Pid ! X end, Relay(Pid) instead"}).
 -deprecated({sleep,     1, "use 'receive after T -> ok end' instead"}).
 
 
@@ -130,7 +129,6 @@ cast(N,M,F,A) -> rpc:cast(N,M,F,A).
 broadcast(M,F,A) -> rpc:eval_everywhere(M,F,A).
 ping(Node) -> net_adm:ping(Node).
 sleep(T) -> receive after T -> ok end.
-relay(X) -> slave:relay(X).
 
 
 %% ===========================================================================
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index 8e11732908..874601812e 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -83,8 +83,6 @@ obsolete(net, cast, 4) ->
     {deprecated, "use rpc:cast/4 instead"};
 obsolete(net, ping, 1) ->
     {deprecated, "use net_adm:ping/1 instead"};
-obsolete(net, relay, 1) ->
-    {deprecated, "use slave:relay/1 instead"};
 obsolete(net, sleep, 1) ->
     {deprecated, "use 'receive after T -> ok end' instead"};
 obsolete(public_key, ssh_decode, 2) ->
@@ -191,6 +189,8 @@ obsolete(httpd_conf, is_file, 1) ->
     {removed, "use filelib:is_file/1 instead"};
 obsolete(httpd_conf, make_integer, 1) ->
     {removed, "use erlang:list_to_integer/1 instead"};
+obsolete(net, relay, 1) ->
+    {removed, "use fun Relay(Pid) -> receive X -> Pid ! X end, Relay(Pid) instead"};
 obsolete(rpc, safe_multi_server_call, 2) ->
     {removed, "use rpc:multi_server_call/2 instead"};
 obsolete(rpc, safe_multi_server_call, 3) ->
@@ -225,6 +225,8 @@ obsolete(gen_fsm, _, _) ->
     {deprecated, "use the 'gen_statem' module instead"};
 obsolete(random, _, _) ->
     {deprecated, "use the 'rand' module instead"};
+obsolete(slave, _, _) ->
+    {deprecated, "use the 'peer' module instead", "OTP 27"};
 obsolete(os_mon_mib, _, _) ->
     {removed, "this module was removed in OTP 22.0"};
 obsolete(pg2, _, _) ->
diff --git a/lib/stdlib/src/pool.erl b/lib/stdlib/src/pool.erl
index 39f9cb2f4c..c338ec3134 100644
--- a/lib/stdlib/src/pool.erl
+++ b/lib/stdlib/src/pool.erl
@@ -103,6 +103,8 @@ pspawn(M, F, A) ->
 pspawn_link(M, F, A) ->
     spawn_link(get_node(), M, F, A).
 
+-compile([{nowarn_deprecated_function,[{slave,start,3}]}]).
+
 start_nodes([], _, _) -> [];
 start_nodes([Host|Tail], Name, Args) -> 
     case slave:start(Host, Name, Args) of 
diff --git a/lib/stdlib/src/slave.erl b/lib/stdlib/src/slave.erl
index a5169c38f7..80c86f8026 100644
--- a/lib/stdlib/src/slave.erl
+++ b/lib/stdlib/src/slave.erl
@@ -19,6 +19,8 @@
 %%
 -module(slave).
 
+-deprecated([{'_','_',"use the 'peer' module instead"}]).
+
 %% If the macro DEBUG is defined during compilation, 
 %% debug printouts are done through erlang:display/1.
 %% Activate this feature by starting the compiler 
diff --git a/system/doc/general_info/DEPRECATIONS b/system/doc/general_info/DEPRECATIONS
index ab304db2a8..6e823fb2c9 100644
--- a/system/doc/general_info/DEPRECATIONS
+++ b/system/doc/general_info/DEPRECATIONS
@@ -17,6 +17,11 @@
 # is scheduled to be removed in OTP 25.
 #
 
+#
+# Added in OTP 25.
+#
+slave:_/_ since=25 remove=27
+
 #
 # Added in OTP 24.
 #
-- 
2.31.1

Places

File 1694-slave-deprecate-the-module-completely.patch of Package erlang (Revision 803d29f7e9aa4c09100926e3598be691)

Places