5 files changed, 21 insertions, 59 deletions
diff --git a/lib/stdlib/src/erl_posix_msg.erl b/lib/stdlib/src/erl_posix_msg.erl
index bfafca1ff7..8959fea498 100644
--- a/lib/stdlib/src/erl_posix_msg.erl
+++ b/lib/stdlib/src/erl_posix_msg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -64,6 +64,7 @@ message_1(eduppkg) -> <<"duplicate package name">>;
 message_1(eexist) -> <<"file already exists">>;
 message_1(efault) -> <<"bad address in system call argument">>;
 message_1(efbig) -> <<"file too large">>;
+message_1(eftype) -> <<"EFTYPE">>;
 message_1(ehostdown) -> <<"host is down">>;
 message_1(ehostunreach) -> <<"host is unreachable">>;
 message_1(eidrm) -> <<"identifier removed">>;
@@ -115,6 +116,7 @@ message_1(enopkg) -> <<"package not installed">>;
 message_1(enoprotoopt) -> <<"bad proocol option">>;
 message_1(enospc) -> <<"no space left on device">>;
 message_1(enosr) -> <<"out of stream resources or not a stream device">>;
+message_1(enostr) -> <<"not a stream">>;
 message_1(enosym) -> <<"unresolved symbol name">>;
 message_1(enosys) -> <<"function not implemented">>;
 message_1(enotblk) -> <<"block device required">>;
@@ -128,6 +130,7 @@ message_1(enotty) -> <<"inappropriate device for ioctl">>;
 message_1(enotuniq) -> <<"name not unique on network">>;
 message_1(enxio) -> <<"no such device or address">>;
 message_1(eopnotsupp) -> <<"operation not supported on socket">>;
+message_1(eoverflow) -> <<"offset too large for file system">>;
 message_1(eperm) -> <<"not owner">>;
 message_1(epfnosupport) -> <<"protocol family not supported">>;
 message_1(epipe) -> <<"broken pipe">>;
@@ -167,4 +170,6 @@ message_1(ewouldblock) -> <<"operation would block">>;
 message_1(exdev) -> <<"cross-domain link">>;
 message_1(exfull) -> <<"message tables full">>;
 message_1(nxdomain) -> <<"non-existing domain">>;
+message_1(exbadport) -> <<"inet_drv bad port state">>;
+message_1(exbadseq) -> <<"inet_drv bad request sequence">>;
 message_1(_) -> <<"unknown POSIX error">>.
diff --git a/lib/stdlib/src/ordsets.erl b/lib/stdlib/src/ordsets.erl
index 569407f5ef..939e147ad8 100644
--- a/lib/stdlib/src/ordsets.erl
+++ b/lib/stdlib/src/ordsets.erl
@@ -19,7 +19,7 @@
 
 -module(ordsets).
 
--export([new/0,is_set/1,size/1,to_list/1,from_list/1]).
+-export([new/0,is_set/1,size/1,is_empty/1,to_list/1,from_list/1]).
 -export([is_element/2,add_element/2,del_element/2]).
 -export([union/2,union/1,intersection/2,intersection/1]).
 -export([is_disjoint/2]).
@@ -60,6 +60,13 @@ is_set([], _) -> true.
 
 size(S) -> length(S).
 
+%% is_empty(OrdSet) -> boolean().
+%%  Return 'true' if OrdSet is an empty set, otherwise 'false'.
+-spec is_empty(Ordset) -> boolean() when
+      Ordset :: ordset(_).
+
+is_empty(S) -> S=:=[].
+
 %% to_list(OrdSet) -> [Elem].
 %%  Return the elements in OrdSet as a list.
 
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index 122b476ddb..5b488cc677 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -609,52 +609,6 @@ obsolete_1(filename, find_src, 2) ->
 obsolete_1(erlang, hash, 2) ->
     {removed, {erlang, phash2, 2}, "20.0"};
 
-%% Added in OTP-21
-obsolete_1(string, len, 1) ->
-    {deprecated, "deprecated; use string:length/3 instead"};
-obsolete_1(string, concat, 2) ->
-    {deprecated, "deprecated; use [Str1,Str2] instead"};
-obsolete_1(string, str, 2) ->
-    {deprecated, "deprecated; use string:find/2 instead"};
-obsolete_1(string, rstr, 2) ->
-    {deprecated, "deprecated; use string:find/3 instead"};
-obsolete_1(string, chr, 2) ->
-    {deprecated, "deprecated; use string:find/2 instead"};
-obsolete_1(string, rchr, 2) ->
-    {deprecated, "deprecated; use string:find/3 instead"};
-obsolete_1(string, span, 2) ->
-    {deprecated, "deprecated; use string:take/2 instead"};
-obsolete_1(string, cspan, 2) ->
-    {deprecated, "deprecated; use string:take/3 instead"};
-obsolete_1(string, substr, _) ->
-    {deprecated, "deprecated; use string:slice/3 instead"};
-obsolete_1(string, tokens, 2) ->
-    {deprecated, "deprecated; use string:lexemes/2 instead"};
-obsolete_1(string, chars, _) ->
-    {deprecated, "deprecated; use lists:duplicate/2 instead"};
-obsolete_1(string, copies, _) ->
-    {deprecated, "deprecated; use lists:duplicate/2 instead"};
-obsolete_1(string, words, _) ->
-    {deprecated, "deprecated; use string:lexemes/2 instead"};
-obsolete_1(string, strip, _) ->
-    {deprecated, "deprecated; use string:trim/3 instead"};
-obsolete_1(string, sub_word, _) ->
-    {deprecated, "deprecated; use string:nth_lexeme/3 instead"};
-obsolete_1(string, sub_string, _) ->
-    {deprecated, "deprecated; use string:slice/3 instead"};
-obsolete_1(string, left, _) ->
-    {deprecated, "deprecated; use string:pad/3 instead"};
-obsolete_1(string, right, _) ->
-    {deprecated, "deprecated; use string:pad/3 instead"};
-obsolete_1(string, centre, _) ->
-    {deprecated, "deprecated; use string:pad/3 instead"};
-obsolete_1(string, join, _) ->
-    {deprecated, "deprecated; use lists:join/2 instead"};
-obsolete_1(string, to_upper, _) ->
-    {deprecated, "deprecated; use string:uppercase/1 or string:titlecase/1 instead"};
-obsolete_1(string, to_lower, _) ->
-    {deprecated, "deprecated; use string:lowercase/1 or string:casefold/1 instead"};
-
 %% not obsolete
 
 obsolete_1(_, _, _) ->
diff --git a/lib/stdlib/src/sets.erl b/lib/stdlib/src/sets.erl
index c65a13b22e..ac0fc80526 100644
--- a/lib/stdlib/src/sets.erl
+++ b/lib/stdlib/src/sets.erl
@@ -37,7 +37,7 @@
 -module(sets).
 
 %% Standard interface.
--export([new/0,is_set/1,size/1,to_list/1,from_list/1]).
+-export([new/0,is_set/1,size/1,is_empty/1,to_list/1,from_list/1]).
 -export([is_element/2,add_element/2,del_element/2]).
 -export([union/2,union/1,intersection/2,intersection/1]).
 -export([is_disjoint/2]).
@@ -96,6 +96,12 @@ is_set(_) -> false.
       Set :: set().
 size(S) -> S#set.size. 
 
+%% is_empty(Set) -> boolean().
+%%  Return 'true' if Set is an empty set, otherwise 'false'.
+-spec is_empty(Set) -> boolean() when
+      Set :: set().
+is_empty(S) -> S#set.size=:=0.
+
 %% to_list(Set) -> [Elem].
 %%  Return the elements in Set as a list.
 -spec to_list(Set) -> List when
diff --git a/lib/stdlib/src/string.erl b/lib/stdlib/src/string.erl
index 4e89819e41..0736374f21 100644
--- a/lib/stdlib/src/string.erl
+++ b/lib/stdlib/src/string.erl
@@ -88,16 +88,6 @@
 %%% May be removed
 -export([list_to_float/1, list_to_integer/1]).
 
--deprecated([{len,1},{concat,2},
-             {str,2},{chr,2},{rchr,2},{rstr,2},
-             {span,2},{cspan,2},{substr,'_'},{tokens,2},
-             {chars,'_'},
-             {copies,2},{words,'_'},{strip,'_'},
-             {sub_word,'_'},{left,'_'},{right,'_'},
-             {sub_string,'_'},{centre,'_'},{join,2},
-             {to_upper,1}, {to_lower,1}
-            ]).
-
 %% Uses bifs: string:list_to_float/1 and string:list_to_integer/1
 -spec list_to_float(String) -> {Float, Rest} | {'error', Reason} when
       String :: string(),