diff options
| author | Björn Gustavsson <[email protected]> | 2016-05-13 10:23:26 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-05-13 10:23:26 +0200 |
| commit | 5c831fec8b0318a762d5b398aa8c135949cc42c0 (patch) | |
| tree | a44a429226c634c0d0386f886e813d17117156d5 | |
| parent | 35bee6986f9dd2a8111ffa86f93c5907a7bfe759 (diff) | |
| parent | a8d755f1fb6159dbd05c42e08b0fc87cf8a96663 (diff) | |
| download | otp-5c831fec8b0318a762d5b398aa8c135949cc42c0.tar.gz otp-5c831fec8b0318a762d5b398aa8c135949cc42c0.tar.bz2 otp-5c831fec8b0318a762d5b398aa8c135949cc42c0.zip | |
Merge branch 'mururu/stdlib/fix-deprecated-warnings/PR-1050/OTP-13594'
* mururu/stdlib/fix-deprecated-warnings/PR-1050/OTP-13594:
Fix deprecated warnings
| -rw-r--r-- | lib/stdlib/src/otp_internal.erl | 2 | ||||
| -rw-r--r-- | lib/stdlib/test/erl_lint_SUITE.erl | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl index 7a59523f06..c3ad261daa 100644 --- a/lib/stdlib/src/otp_internal.erl +++ b/lib/stdlib/src/otp_internal.erl @@ -35,7 +35,7 @@ obsolete(Module, Name, Arity) -> case obsolete_1(Module, Name, Arity) of {deprecated=Tag,{_,_,_}=Replacement} -> - {Tag,Replacement,"in a future release"}; + {Tag,Replacement,"a future release"}; {_,String}=Ret when is_list(String) -> Ret; {_,_,_}=Ret -> diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl index b0214e5238..d916eb3eef 100644 --- a/lib/stdlib/test/erl_lint_SUITE.erl +++ b/lib/stdlib/test/erl_lint_SUITE.erl @@ -2003,7 +2003,7 @@ otp_5362(Config) when is_list(Config) -> {error, [{5,erl_lint,{call_to_redefined_old_bif,{spawn,1}}}], [{4,erl_lint,{deprecated,{erlang,hash,2},{erlang,phash2,2}, - "in a future release"}}]}}, + "a future release"}}]}}, {otp_5362_5, <<"-compile(nowarn_deprecated_function). @@ -2063,7 +2063,7 @@ otp_5362(Config) when is_list(Config) -> {nowarn_bif_clash,{spawn,1}}]}, % has no effect {warnings, [{5,erl_lint,{deprecated,{erlang,hash,2},{erlang,phash2,2}, - "in a future release"}}]}}, + "a future release"}}]}}, {otp_5362_9, <<"-include_lib(\"stdlib/include/qlc.hrl\"). @@ -2093,7 +2093,7 @@ otp_5362(Config) when is_list(Config) -> [], {warnings, [{1,erl_lint,{deprecated,{erlang,hash,2}, - {erlang,phash2,2},"in a future release"}}]}}, + {erlang,phash2,2},"a future release"}}]}}, {call_removed_function, <<"t(X) -> regexp:match(X).">>, |