Merge branch 'egil/erts/remove-broken-hash/OTP-13827'

* egil/erts/remove-broken-hash/OTP-13827:
  Update test cases for erlang:hash/2 removal
  mnesia: Remove mnesia_frag_old_hash hash module
  stdlib: Produce correct warning for erlang:hash/2
  erts: Remove erlang:hash/2 from documentation
  erts: Remove broken hash from Erlang

2 files changed, 33 insertions, 28 deletions

diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index f4257fb571..5bf77a5160 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -47,9 +47,6 @@ obsolete(Module, Name, Arity) ->
 obsolete_1(net, _, _) ->
     {deprecated, "module 'net' obsolete; use 'net_adm'"};
 
-obsolete_1(erlang, hash, 2) ->
-    {deprecated, {erlang, phash2, 2}};
-
 obsolete_1(erlang, now, 0) ->
     {deprecated,
      "Deprecated BIF. See the \"Time and Time Correction in Erlang\" "
@@ -553,6 +550,13 @@ obsolete_1(overload, _, _) ->
 obsolete_1(rpc, safe_multi_server_call, A) when A =:= 2; A =:= 3 ->
     {removed, {rpc, multi_server_call, A}};
 
+%% Removed in OTP 20.
+
+obsolete_1(erlang, hash, 2) ->
+    {removed, {erlang, phash2, 2}, "20.0"};
+
+%% not obsolete
+
 obsolete_1(_, _, _) ->
     no.
 
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index c90f855b3b..c7dcd9ae16 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -2002,22 +2002,22 @@ otp_5362(Config) when is_list(Config) ->
            <<"-compile(nowarn_deprecated_function).
               -compile(nowarn_bif_clash).
               spawn(A) ->
-                  erlang:hash(A, 3000),
+                  erlang:now(),
                   spawn(A).
            ">>,
-           {[nowarn_unused_function, 
+           {[nowarn_unused_function,
              warn_deprecated_function,
              warn_bif_clash]},
            {error,
             [{5,erl_lint,{call_to_redefined_old_bif,{spawn,1}}}],
-	    [{4,erl_lint,{deprecated,{erlang,hash,2},{erlang,phash2,2},
-			  "a future release"}}]}},
-
+            [{4,erl_lint,{deprecated,{erlang,now,0},
+                          "Deprecated BIF. See the \"Time and Time Correction in Erlang\" "
+                          "chapter of the ERTS User's Guide for more information."}}]}},
           {otp_5362_5,
            <<"-compile(nowarn_deprecated_function).
               -compile(nowarn_bif_clash).
               spawn(A) ->
-                  erlang:hash(A, 3000),
+                  erlang:now(),
                   spawn(A).
            ">>,
            {[nowarn_unused_function]},
@@ -2026,37 +2026,37 @@ otp_5362(Config) when is_list(Config) ->
 
           %% The special nowarn_X are not affected by general warn_X.
           {otp_5362_6,
-           <<"-compile({nowarn_deprecated_function,{erlang,hash,2}}).
+           <<"-compile({nowarn_deprecated_function,{erlang,now,0}}).
               -compile({nowarn_bif_clash,{spawn,1}}).
               spawn(A) ->
-                  erlang:hash(A, 3000),
+                  erlang:now(),
                   spawn(A).
            ">>,
-           {[nowarn_unused_function, 
-             warn_deprecated_function, 
+           {[nowarn_unused_function,
+             warn_deprecated_function,
              warn_bif_clash]},
            {errors,
             [{2,erl_lint,disallowed_nowarn_bif_clash}],[]}},
 
           {otp_5362_7,
            <<"-export([spawn/1]).
-              -compile({nowarn_deprecated_function,{erlang,hash,2}}).
+              -compile({nowarn_deprecated_function,{erlang,now,0}}).
               -compile({nowarn_bif_clash,{spawn,1}}).
               -compile({nowarn_bif_clash,{spawn,2}}). % bad
               -compile([{nowarn_deprecated_function, 
-                                [{erlang,hash,-1},{3,hash,-1}]}, % 2 bad
-                     {nowarn_deprecated_function, {{a,b,c},hash,-1}}]). % bad
+                                [{erlang,now,-1},{3,now,-1}]}, % 2 bad
+                     {nowarn_deprecated_function, {{a,b,c},now,-1}}]). % bad
               spawn(A) ->
-                  erlang:hash(A, 3000),
+                  erlang:now(),
                   spawn(A).
            ">>,
            {[nowarn_unused_function]},
            {error,[{3,erl_lint,disallowed_nowarn_bif_clash},
 		   {4,erl_lint,disallowed_nowarn_bif_clash},
 		   {4,erl_lint,{bad_nowarn_bif_clash,{spawn,2}}}],
-            [{5,erl_lint,{bad_nowarn_deprecated_function,{3,hash,-1}}},
-             {5,erl_lint,{bad_nowarn_deprecated_function,{erlang,hash,-1}}},
-             {5,erl_lint,{bad_nowarn_deprecated_function,{{a,b,c},hash,-1}}}]}
+            [{5,erl_lint,{bad_nowarn_deprecated_function,{3,now,-1}}},
+             {5,erl_lint,{bad_nowarn_deprecated_function,{erlang,now,-1}}},
+             {5,erl_lint,{bad_nowarn_deprecated_function,{{a,b,c},now,-1}}}]}
            },
 
           {otp_5362_8,
@@ -2064,14 +2064,15 @@ otp_5362(Config) when is_list(Config) ->
               -compile(warn_deprecated_function).
               -compile(warn_bif_clash).
               spawn(A) ->
-                  erlang:hash(A, 3000),
+                  erlang:now(),
                   spawn(A).
            ">>,
            {[nowarn_unused_function,
              {nowarn_bif_clash,{spawn,1}}]}, % has no effect
            {warnings,
-            [{5,erl_lint,{deprecated,{erlang,hash,2},{erlang,phash2,2},
-			  "a future release"}}]}},
+            [{5,erl_lint,{deprecated,{erlang,now,0},
+                          "Deprecated BIF. See the \"Time and Time Correction in Erlang\" "
+                          "chapter of the ERTS User's Guide for more information."}}]}},
 
           {otp_5362_9,
            <<"-include_lib(\"stdlib/include/qlc.hrl\").
@@ -2083,11 +2084,11 @@ otp_5362(Config) when is_list(Config) ->
            []},
 
           {otp_5362_10,
-           <<"-compile({nowarn_deprecated_function,{erlang,hash,2}}).
+           <<"-compile({nowarn_deprecated_function,{erlang,now,0}}).
               -compile({nowarn_bif_clash,{spawn,1}}).
               -import(x,[spawn/1]).
               spin(A) ->
-                  erlang:hash(A, 3000),
+                  erlang:now(),
                   spawn(A).
            ">>,
            {[nowarn_unused_function,
@@ -2097,11 +2098,11 @@ otp_5362(Config) when is_list(Config) ->
             [{2,erl_lint,disallowed_nowarn_bif_clash}],[]}},
 
 	  {call_deprecated_function,
-	   <<"t(X) -> erlang:hash(X, 2000).">>,
+	   <<"t(X) -> crypto:md5(X).">>,
 	   [],
 	   {warnings,
-            [{1,erl_lint,{deprecated,{erlang,hash,2},
-			  {erlang,phash2,2},"a future release"}}]}},
+            [{1,erl_lint,{deprecated,{crypto,md5,1},
+			  {crypto,hash,2}, "a future release"}}]}},
 
 	  {call_removed_function,
 	   <<"t(X) -> regexp:match(X).">>,