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, 5 insertions, 5 deletions

diff --git a/lib/tools/src/lcnt.erl b/lib/tools/src/lcnt.erl
index 70d62307c8..0694a47318 100644
--- a/lib/tools/src/lcnt.erl
+++ b/lib/tools/src/lcnt.erl
@@ -272,7 +272,7 @@ handle_call({locations, InOpts}, _From, #state{ locks = Locks } = State) when is
     Opts = options(InOpts, Default),
     Printables = filter_print([#print{
 	    name  = string_names(Names),
-	    entry = term2string("~p:~p", [Stats#stats.file, Stats#stats.line]),
+	    entry = term2string("~tp:~p", [Stats#stats.file, Stats#stats.line]),
 	    colls = Stats#stats.colls,
 	    tries = Stats#stats.tries,
 	    cr    = percent(Stats#stats.colls, Stats#stats.tries),
@@ -567,7 +567,7 @@ stats2print(Stats, Duration) ->
     lists:map(fun
 	(S) ->
 	    #print{
-		entry = term2string("~p:~p", [S#stats.file, S#stats.line]),
+		entry = term2string("~tp:~p", [S#stats.file, S#stats.line]),
 		colls = S#stats.colls,
 		tries = S#stats.tries,
 		cr    = percent(S#stats.colls, S#stats.tries),
@@ -798,20 +798,20 @@ options1([{Key, Value}|Opts], Defaults) ->
 
 %%% AUX STRING FORMATTING
 
-print(String) -> io:format("~s~n", [String]).
+print(String) -> io:format("~ts~n", [String]).
 
 kv(Key, Value) -> kv(Key, Value, 20).
 kv(Key, Value, Offset) -> term2string(term2string("~~~ps : ~~s", [Offset]),[Key, Value]).
 
 s(T) when is_float(T) -> term2string("~.4f", [T]);
-s(T) when is_list(T)  -> term2string("~s", [T]);
+s(T) when is_list(T)  -> term2string("~ts", [T]);
 s(T)                  -> term2string(T).
 
 strings(Strings) -> strings(Strings, []).
 strings([], Out) -> Out;
 strings([{space,  N,      S} | Ss], Out) -> strings(Ss, Out ++ term2string(term2string("~~~ps", [N]), [S]));
 strings([{format, Format, S} | Ss], Out) -> strings(Ss, Out ++ term2string(Format, [S]));
-strings([S|Ss], Out) -> strings(Ss, Out ++ term2string("~s", [S])).
+strings([S|Ss], Out) -> strings(Ss, Out ++ term2string("~ts", [S])).
 
 
 term2string({M,F,A}) when is_atom(M), is_atom(F), is_integer(A) -> term2string("~p:~p/~p", [M,F,A]);