Merge branch 'hb/unicode/OTP-10302'

OTP-10742
OTP-10745
OTP-10749

* hb/unicode/OTP-10302:
  [stdlib] Remove documentation of ~tp
  Remove one use of iolist_size/1 in io_lib_pretty.erl
  Add a new function proc_lib:format/2 which takes encoding
  Export the type erl_scan:token()
  Make adjustments for Unicode
  [stdlib] Change default of erl_scan's unicode option
  Update preloaded
  Correct recently introduced Unicode related type errors
  [stdlib] Introduce new functions epp:read_encoding_from_binary/1,2
  Extend char() to Unicode characters
  [kernel] Correct bugs in the old shell (user.erl)
  [parsetools] Change the encoding of test suites to UTF-8
  [stdlib] Fix a contract bug
  [stdlib] Update the Unicode examples in STDLIB User's Guide
  [stdlib] Remove documentation of Unicode functions in io_lib

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/stdlib/src/file_sorter.erl b/lib/stdlib/src/file_sorter.erl
index 3f31852afc..83782834cc 100644
--- a/lib/stdlib/src/file_sorter.erl
+++ b/lib/stdlib/src/file_sorter.erl
@@ -633,7 +633,7 @@ last_merge(R, W) when length(R) =< W#w.no_files ->
     case W#w.out of
         Fun when is_function(Fun) ->
             {Fs, W1} = init_merge(lists:reverse(R), 1, [], W),
-            ?DEBUG("merging ~p~n", [lists:reverse(R)]),
+            ?DEBUG("merging ~tp~n", [lists:reverse(R)]),
             W2 = merge_files(Fs, [], 0, nolast, W1),
             NW = close_input(W2),
             outfun(close, NW);
@@ -659,7 +659,7 @@ merge_runs([R, R1 | Rs], NRs0, W) ->
 
 merge_files(R, W) ->
     {W1, Temp} = next_temp(W),
-    ?DEBUG("merging ~p~nto ~p~n", [lists:reverse(R), Temp]),
+    ?DEBUG("merging ~tp~nto ~tp~n", [lists:reverse(R), Temp]),
     {Temp, merge_files(R, W1, Temp)}.
     
 merge_files(R, W, FileName) ->
@@ -1501,7 +1501,7 @@ close_out(_) ->
 
 close_file(Fd, W) ->
     {Fd, FileName} = lists:keyfind(Fd, 1, W#w.temp),
-    ?DEBUG("closing ~p~n", [FileName]),
+    ?DEBUG("closing ~tp~n", [FileName]),
     file:close(Fd),
     W#w{temp = [FileName | lists:keydelete(Fd, 1, W#w.temp)]}.