diff options
| author | Siri Hansen <[email protected]> | 2017-09-15 17:26:30 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2017-09-15 17:26:30 +0200 |
| commit | c84f6fa2dc7c7615e36a575571ee1a6e9cd586a4 (patch) | |
| tree | 0e5e5e3a59e51275b58bfe4f2bd1e398946d6a96 /lib/stdlib/src/ets.erl | |
| parent | ce7c134f7509f9d1c996d17bf5575bf2b37ad192 (diff) | |
| parent | 5a9f3a48b2a6b58df16eb4a78d50ecd8f378bbd8 (diff) | |
| download | otp-c84f6fa2dc7c7615e36a575571ee1a6e9cd586a4.tar.gz otp-c84f6fa2dc7c7615e36a575571ee1a6e9cd586a4.tar.bz2 otp-c84f6fa2dc7c7615e36a575571ee1a6e9cd586a4.zip | |
Merge branch 'siri/string-new-api'
* siri/string-new-api: (28 commits)
hipe (test): Do not use deprecated functions in string(3)
dialyzer (test): Do not use deprecated functions in string(3)
eunit (test): Do not use deprecated functions in string(3)
system (test): Do not use deprecated functions in string(3)
system (test): Do not use deprecated functions in string(3)
mnesia (test): Do not use deprecated functions in string(3)
Deprecate old string functions
observer: Do not use deprecated functions in string(3)
common_test: Do not use deprecated functions in string(3)
eldap: Do not use deprecated functions in string(3)
et: Do not use deprecated functions in string(3)
os_mon: Do not use deprecated functions in string(3)
debugger: Do not use deprecated functions in string(3)
runtime_tools: Do not use deprecated functions in string(3)
asn1: Do not use deprecated functions in string(3)
compiler: Do not use deprecated functions in string(3)
sasl: Do not use deprecated functions in string(3)
reltool: Do not use deprecated functions in string(3)
kernel: Do not use deprecated functions in string(3)
hipe: Do not use deprecated functions in string(3)
...
Conflicts:
lib/eunit/src/eunit_lib.erl
lib/observer/src/crashdump_viewer.erl
lib/reltool/src/reltool_target.erl
Diffstat (limited to 'lib/stdlib/src/ets.erl')
| -rw-r--r-- | lib/stdlib/src/ets.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/src/ets.erl b/lib/stdlib/src/ets.erl index b5d3cd3c8d..4858c8d13c 100644 --- a/lib/stdlib/src/ets.erl +++ b/lib/stdlib/src/ets.erl @@ -1717,7 +1717,7 @@ get_line(P, Default) -> line_string(Binary) when is_binary(Binary) -> unicode:characters_to_list(Binary); line_string(Other) -> Other. -nonl(S) -> string:strip(S, right, $\n). +nonl(S) -> string:trim(S, trailing, "$\n"). print_number(Tab, Key, Num) -> Os = ets:lookup(Tab, Key), @@ -1746,7 +1746,7 @@ do_display_item(_Height, Width, I, Opos) -> L = to_string(I), L2 = if length(L) > Width - 8 -> - string:substr(L, 1, Width-13) ++ " ..."; + string:slice(L, 0, Width-13) ++ " ..."; true -> L end, |