Merge branch 'rickard/time-unit/OTP-13831'

* rickard/time-unit/OTP-13831:
  Replace usage of deprecated time units

7 files changed, 13 insertions, 13 deletions

diff --git a/lib/stdlib/src/dets.erl b/lib/stdlib/src/dets.erl
index bf22949870..8ce29f23d3 100644
--- a/lib/stdlib/src/dets.erl
+++ b/lib/stdlib/src/dets.erl
@@ -3305,7 +3305,7 @@ time_now() ->
 make_timestamp(MonTime, TimeOffset) ->
     ErlangSystemTime = erlang:convert_time_unit(MonTime+TimeOffset,
 						native,
-						micro_seconds),
+						microsecond),
     MegaSecs = ErlangSystemTime div 1000000000000,
     Secs = ErlangSystemTime div 1000000 - MegaSecs*1000000,
     MicroSecs = ErlangSystemTime rem 1000000,
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src
index 09176d2ca0..8cf46482dd 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -106,7 +106,7 @@
                dets]},
   {applications, [kernel]},
   {env, []},
-  {runtime_dependencies, ["sasl-3.0","kernel-5.0","erts-8.0","crypto-3.3",
+  {runtime_dependencies, ["sasl-3.0","kernel-5.0","erts-9.0","crypto-3.3",
 			  "compiler-5.0"]}
 ]}.
 
diff --git a/lib/stdlib/src/timer.erl b/lib/stdlib/src/timer.erl
index ca868627a9..df10790ea0 100644
--- a/lib/stdlib/src/timer.erl
+++ b/lib/stdlib/src/timer.erl
@@ -165,7 +165,7 @@ tc(F) ->
     T1 = erlang:monotonic_time(),
     Val = F(),
     T2 = erlang:monotonic_time(),
-    Time = erlang:convert_time_unit(T2 - T1, native, micro_seconds),
+    Time = erlang:convert_time_unit(T2 - T1, native, microsecond),
     {Time, Val}.
 
 %%
@@ -180,7 +180,7 @@ tc(F, A) ->
     T1 = erlang:monotonic_time(),
     Val = apply(F, A),
     T2 = erlang:monotonic_time(),
-    Time = erlang:convert_time_unit(T2 - T1, native, micro_seconds),
+    Time = erlang:convert_time_unit(T2 - T1, native, microsecond),
     {Time, Val}.
 
 %%
@@ -196,7 +196,7 @@ tc(M, F, A) ->
     T1 = erlang:monotonic_time(),
     Val = apply(M, F, A),
     T2 = erlang:monotonic_time(),
-    Time = erlang:convert_time_unit(T2 - T1, native, micro_seconds),
+    Time = erlang:convert_time_unit(T2 - T1, native, microsecond),
     {Time, Val}.
 
 %%
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index e726a29c9e..9a14c7014c 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -4446,15 +4446,15 @@ build_table2(L1,L2,Num) ->
     T.
 
 time_match_object(Tab,Match, Res) ->
-    T1 = erlang:monotonic_time(micro_seconds),
+    T1 = erlang:monotonic_time(microsecond),
     Res = ets:match_object(Tab,Match),
-    T2 = erlang:monotonic_time(micro_seconds),
+    T2 = erlang:monotonic_time(microsecond),
     T2 - T1.
 
 time_match(Tab,Match) ->
-    T1 = erlang:monotonic_time(micro_seconds),
+    T1 = erlang:monotonic_time(microsecond),
     ets:match(Tab,Match),
-    T2 = erlang:monotonic_time(micro_seconds),
+    T2 = erlang:monotonic_time(microsecond),
     T2 - T1.
 
 seventyfive_percent_success(_,S,Fa,0) ->
@@ -6276,7 +6276,7 @@ do_tc(Do, Report) ->
     T1 = erlang:monotonic_time(),
     Do(),
     T2 = erlang:monotonic_time(),
-    Elapsed = erlang:convert_time_unit(T2 - T1, native, milli_seconds),
+    Elapsed = erlang:convert_time_unit(T2 - T1, native, millisecond),
     Report(Elapsed).
 
 syrup_factor() ->
diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl
index 1e286a9306..db321d7490 100644
--- a/lib/stdlib/test/io_proto_SUITE.erl
+++ b/lib/stdlib/test/io_proto_SUITE.erl
@@ -1715,7 +1715,7 @@ toerl_loop(Port,Acc) ->
     end.
 
 millistamp() ->
-    erlang:monotonic_time(milli_seconds).
+    erlang:monotonic_time(millisecond).
 
 get_data_within(Port, X, Acc) when X =< 0 ->
     ?dbg({get_data_within, X, Acc, ?LINE}),
diff --git a/lib/stdlib/test/timer_SUITE.erl b/lib/stdlib/test/timer_SUITE.erl
index 5fc95b16a6..9062cbae80 100644
--- a/lib/stdlib/test/timer_SUITE.erl
+++ b/lib/stdlib/test/timer_SUITE.erl
@@ -353,7 +353,7 @@ res_combine({error,Es}, [{error,E}|T]) ->
 
 
 system_time() ->
-    erlang:monotonic_time(milli_seconds).
+    erlang:monotonic_time(millisecond).
 
 %% ------------------------------------------------------- %%
 
diff --git a/lib/stdlib/test/timer_simple_SUITE.erl b/lib/stdlib/test/timer_simple_SUITE.erl
index ff5116b8b6..1a582ae95a 100644
--- a/lib/stdlib/test/timer_simple_SUITE.erl
+++ b/lib/stdlib/test/timer_simple_SUITE.erl
@@ -457,7 +457,7 @@ append([],X) ->
     X.
 
 system_time() ->    
-    erlang:monotonic_time(micro_seconds).
+    erlang:monotonic_time(microsecond).
 
 %% ------------------------------------------------------- %%