Merge branch 'hb/stdlib/unicode_corrections/OTP-10820'

* hb/stdlib/unicode_corrections/OTP-10820:
  Use ~ts for filenames

9 files changed, 32 insertions, 32 deletions

diff --git a/lib/edoc/src/edoc.erl b/lib/edoc/src/edoc.erl
index 599036f380..0114cc906f 100644
--- a/lib/edoc/src/edoc.erl
+++ b/lib/edoc/src/edoc.erl
@@ -660,7 +660,7 @@ read_source(Name, Opts0) ->
 	    check_forms(Forms, Name),
 	    Forms;
 	{error, R} ->
-	    edoc_report:error({"error reading file '~s'.",
+	    edoc_report:error({"error reading file '~ts'.",
                                [edoc_lib:filename(Name)]}),
 	    exit({error, R})
     end.
diff --git a/lib/edoc/src/edoc_doclet.erl b/lib/edoc/src/edoc_doclet.erl
index a0c1ae1c0f..ce1e94a26a 100644
--- a/lib/edoc/src/edoc_doclet.erl
+++ b/lib/edoc/src/edoc_doclet.erl
@@ -200,7 +200,7 @@ source({M, P, Name, Path}, Dir, Suffix, Env, Set, Private, Hidden,
 		    {Set, Error}
 	    end;
 	R ->
-	    report("skipping source file '~s': ~W.", [File, R, 15]),
+	    report("skipping source file '~ts': ~W.", [File, R, 15]),
 	    {Set, true}
     end.
 
@@ -216,14 +216,14 @@ check_name(M, M0, P0, File) ->
 	    ok;
 	_ ->
 	    if N =/= N0 ->
-		    warning("file '~s' actually contains module '~s'.",
+		    warning("file '~ts' actually contains module '~s'.",
 			    [File, M]);
 	       true ->
 		    ok
 	    end
     end,
     if P =/= P0 ->
-	    warning("file '~s' belongs to package '~s', not '~s'.",
+	    warning("file '~ts' belongs to package '~s', not '~s'.",
 		    [File, P, P0]);
        true ->
 	    ok
diff --git a/lib/edoc/src/edoc_lib.erl b/lib/edoc/src/edoc_lib.erl
index d9c225e099..276f48453e 100644
--- a/lib/edoc/src/edoc_lib.erl
+++ b/lib/edoc/src/edoc_lib.erl
@@ -466,20 +466,20 @@ uri_get("file://localhost/" ++ Path) ->
     uri_get_file(Path);
 uri_get("file://" ++ Path) ->
     Msg = io_lib:format("cannot handle 'file:' scheme with "
-			"nonlocal network-path: 'file://~s'.",
+			"nonlocal network-path: 'file://~ts'.",
 			[Path]),
     {error, Msg};
 uri_get("file:/" ++ Path) ->
     uri_get_file(Path);
 uri_get("file:" ++ Path) ->
-    Msg = io_lib:format("ignoring malformed URI: 'file:~s'.", [Path]),
+    Msg = io_lib:format("ignoring malformed URI: 'file:~ts'.", [Path]),
     {error, Msg};
 uri_get("http:" ++ Path) ->
     uri_get_http("http:" ++ Path);
 uri_get("ftp:" ++ Path) ->
     uri_get_ftp("ftp:" ++ Path);
 uri_get("//" ++ Path) ->
-    Msg = io_lib:format("cannot access network-path: '//~s'.", [Path]),
+    Msg = io_lib:format("cannot access network-path: '//~ts'.", [Path]),
     {error, Msg};
 uri_get([C, $:, $/ | _]=Path) when C >= $A, C =< $Z; C >= $a, C =< $z ->
     uri_get_file(Path);  % special case for Windows
@@ -490,7 +490,7 @@ uri_get(URI) ->
 	true ->
 	    uri_get_file(URI);
 	false ->
-	    Msg = io_lib:format("cannot handle URI: '~s'.", [URI]),
+	    Msg = io_lib:format("cannot handle URI: '~ts'.", [URI]),
 	    {error, Msg}
     end.
 
@@ -555,12 +555,12 @@ uri_get_http_1(Result, URI) ->
     end.
 
 http_errmsg(Reason, URI) ->
-    io_lib:format("http error: ~s: '~s'", [Reason, URI]).
+    io_lib:format("http error: ~ts: '~ts'", [Reason, URI]).
 
 %% TODO: implement ftp access method
 
 uri_get_ftp(URI) ->
-    Msg = io_lib:format("cannot access ftp scheme yet: '~s'.", [URI]),
+    Msg = io_lib:format("cannot access ftp scheme yet: '~ts'.", [URI]),
     {error, Msg}.
 
 %% @private
@@ -615,7 +615,7 @@ copy_file(From, To) ->
 	{ok, _} -> ok;
 	{error, R} ->
 	    R1 = file:format_error(R),
-	    report("error copying '~s' to '~s': ~s.", [From, To, R1]),
+	    report("error copying '~ts' to '~ts': ~ts.", [From, To, R1]),
 	    exit(error)
     end.
 
@@ -631,7 +631,7 @@ list_dir(Dir, Error) ->
 			fun (S, As) -> warning(S, As), [] end
 		end,
 	    R1 = file:format_error(R),
-	    F("could not read directory '~s': ~s.", [filename(Dir), R1])
+	    F("could not read directory '~ts': ~ts.", [filename(Dir), R1])
     end.
 
 %% @private
@@ -667,7 +667,7 @@ simplify_path(P) ->
 %% 	ok -> ok;
 %% 	{error, R} ->
 %% 	    R1 = file:format_error(R),
-%% 	    report("cannot create directory '~s': ~s.", [Dir, R1]),
+%% 	    report("cannot create directory '~ts': ~ts.", [Dir, R1]),
 %% 	    exit(error)
 %%     end.
 
@@ -707,7 +707,7 @@ write_file(Text, Dir, Name, Package, Options) ->
 	    ok = file:close(FD);
 	{error, R} ->
 	    R1 = file:format_error(R),
-	    report("could not write file '~s': ~s.", [File, R1]),
+	    report("could not write file '~ts': ~ts.", [File, R1]),
 	    exit(error)
     end.
 
@@ -761,7 +761,7 @@ read_info_file(Dir) ->
 		    parse_info_file(Text, File);
 		{error, R} ->
 		    R1 = file:format_error(R),
-		    warning("could not read '~s': ~s.", [File, R1]),
+		    warning("could not read '~ts': ~ts.", [File, R1]),
 		    {?NO_APP, [], []}
 	    end;	    
 	false ->
@@ -776,7 +776,7 @@ uri_get_info_file(Base) ->
 	{ok, Text} ->
 	    parse_info_file(Text, URI);
 	{error, Msg} ->
-	    warning("could not read '~s': ~s.", [URI, Msg]),
+	    warning("could not read '~ts': ~ts.", [URI, Msg]),
 	    {?NO_APP, [], []}
     end.
 
@@ -785,10 +785,10 @@ parse_info_file(Text, Name) ->
 	{ok, Vs} ->
 	    info_file_data(Vs);
 	{error, eof} ->
-	    warning("unexpected end of file in '~s'.", [Name]),
+	    warning("unexpected end of file in '~ts'.", [Name]),
 	    {?NO_APP, [], []};
 	{error, {_Line,Module,R}} ->
-	    warning("~s: ~s.", [Module:format_error(R), Name]),
+	    warning("~ts: ~ts.", [Module:format_error(R), Name]),
 	    {?NO_APP, [], []}
     end.
 
@@ -1033,7 +1033,7 @@ run_plugin(Name, Key, Default, Fun, Opts) when is_atom(Name) ->
 	{ok, Value} ->
 	    Value;
 	R ->
-	    report("error in ~s '~w': ~W.", [Name, Module, R, 20]),
+	    report("error in ~ts '~w': ~W.", [Name, Module, R, 20]),
 	    exit(error)
     end.
 
diff --git a/lib/edoc/src/edoc_macros.erl b/lib/edoc/src/edoc_macros.erl
index 08686c4fb5..8efbfd00c7 100644
--- a/lib/edoc/src/edoc_macros.erl
+++ b/lib/edoc/src/edoc_macros.erl
@@ -88,7 +88,7 @@ link_macro(S, Line, Env) ->
 		 true -> " target=\"_top\""; % note the initial space
 		 false -> ""
 	     end,
-    lists:flatten(io_lib:fwrite("<a href=\"~s\"~s>~ts</a>",
+    lists:flatten(io_lib:fwrite("<a href=\"~ts\"~ts>~ts</a>",
 				[URI, Target, Txt])).
 
 section_macro(S, _Line, _Env) ->
@@ -102,7 +102,7 @@ type_macro(S, Line, Env) ->
     Def = edoc_parser:parse_typedef(S1, Line),
     {#t_typedef{type = T}, _} = Def,
     Txt = edoc_layout:type(edoc_data:type(T, Env)),
-    lists:flatten(io_lib:fwrite("<code>~s</code>", [Txt])).
+    lists:flatten(io_lib:fwrite("<code>~ts</code>", [Txt])).
 
 
 %% Expand inline macros in tag content.
diff --git a/lib/edoc/src/edoc_parser.yrl b/lib/edoc/src/edoc_parser.yrl
index cf1a2d6b11..a20f152f34 100644
--- a/lib/edoc/src/edoc_parser.yrl
+++ b/lib/edoc/src/edoc_parser.yrl
@@ -462,4 +462,4 @@ throw_error({parse_throws, E}, L) ->
 throw_error(parse_param, L) ->
     throw({error, L, "missing parameter name"});
 throw_error({Where, E}, L) when is_list(Where) ->
-    throw({error,L,{"unknown error parsing ~s: ~P.",[Where,E,15]}}).
+    throw({error,L,{"unknown error parsing ~ts: ~P.",[Where,E,15]}}).
diff --git a/lib/edoc/src/edoc_report.erl b/lib/edoc/src/edoc_report.erl
index 9bec08ab97..dc6320df6d 100644
--- a/lib/edoc/src/edoc_report.erl
+++ b/lib/edoc/src/edoc_report.erl
@@ -83,13 +83,13 @@ report(L, Where, S, Vs) ->
     io:nl().
 
 where({File, module}) ->
-    io_lib:fwrite("~s, in module header: ", [File]);
+    io_lib:fwrite("~ts, in module header: ", [File]);
 where({File, footer}) ->
-    io_lib:fwrite("~s, in module footer: ", [File]);
+    io_lib:fwrite("~ts, in module footer: ", [File]);
 where({File, header}) ->
-    io_lib:fwrite("~s, in header file: ", [File]);
+    io_lib:fwrite("~ts, in header file: ", [File]);
 where({File, {F, A}}) ->
-    io_lib:fwrite("~s, function ~s/~w: ", [File, F, A]);
+    io_lib:fwrite("~ts, function ~s/~w: ", [File, F, A]);
 where([]) ->
     io_lib:fwrite("~s: ", [?APPLICATION]);
 where(File) when is_list(File) ->
diff --git a/lib/edoc/src/edoc_run.erl b/lib/edoc/src/edoc_run.erl
index 48b6137ac1..b5a1ef713d 100644
--- a/lib/edoc/src/edoc_run.erl
+++ b/lib/edoc/src/edoc_run.erl
@@ -162,7 +162,7 @@ file(Args) ->
 -spec invalid_args(string(), list()) -> no_return().
 
 invalid_args(Where, Args) ->
-    report("invalid arguments to ~s: ~w.", [Where, Args]),
+    report("invalid arguments to ~ts: ~w.", [Where, Args]),
     shutdown_error().
 
 run(F) ->
@@ -213,13 +213,13 @@ parse_arg(A) ->
 	{ok, Expr} ->
 	    case catch erl_parse:normalise(Expr) of
 		{'EXIT', _} ->
-		    report("bad argument: '~s':", [A]),
+		    report("bad argument: '~ts':", [A]),
 		    exit(error);
 		Term ->
 		    Term
 	    end;
 	{error, _, D} ->
-	    report("error parsing argument '~s'", [A]),
+	    report("error parsing argument '~ts'", [A]),
 	    error(D),
 	    exit(error)
     end.
diff --git a/lib/edoc/src/edoc_tags.erl b/lib/edoc/src/edoc_tags.erl
index 2d986988c2..eb41f1922a 100644
--- a/lib/edoc/src/edoc_tags.erl
+++ b/lib/edoc/src/edoc_tags.erl
@@ -391,10 +391,10 @@ parse_header(Data, Line, Env, Where) when is_list(Where) ->
 -spec throw_error(line(), err()) -> no_return().
 
 throw_error(L, {read_file, File, R}) ->
-    throw_error(L, {"error reading file '~s': ~w",
+    throw_error(L, {"error reading file '~ts': ~w",
 		    [edoc_lib:filename(File), R]});
 throw_error(L, {file_not_found, F}) ->
-    throw_error(L, {"file not found: ~s", [F]});
+    throw_error(L, {"file not found: ~ts", [F]});
 throw_error(L, file_not_string) ->
     throw_error(L, "expected file name as a string");
 throw_error(L, D) ->
diff --git a/lib/edoc/src/edoc_wiki.erl b/lib/edoc/src/edoc_wiki.erl
index cc0529d2a9..5d0d78bf3c 100644
--- a/lib/edoc/src/edoc_wiki.erl
+++ b/lib/edoc/src/edoc_wiki.erl
@@ -295,7 +295,7 @@ expand_uri([], _, L, _Ss, Us, _As) ->
 
 expand_uri_error(Us, L) ->
     {Ps, _} = edoc_lib:split_at(lists:reverse(Us), $:),
-    throw_error(L, {"reference '[~s:...' ended unexpectedly", [Ps]}).
+    throw_error(L, {"reference '[~ts:...' ended unexpectedly", [Ps]}).
 
 
 push_uri(Us, Ss, As) ->