diff options
| author | Hans Bolinder <[email protected]> | 2016-02-17 09:30:16 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-02-17 09:30:16 +0100 |
| commit | 05a24fed7539f861c7d725829acb196a3991923c (patch) | |
| tree | d55270dbf9cb24ed868e49a090b52431fb105cd3 /lib/stdlib/src/lists.erl | |
| parent | 245f3cc7adc063fc131b051a73237a7e9fcf8524 (diff) | |
| parent | 0d5820c44dde5875d322a84eab6ce4227fe19bec (diff) | |
| download | otp-05a24fed7539f861c7d725829acb196a3991923c.tar.gz otp-05a24fed7539f861c7d725829acb196a3991923c.tar.bz2 otp-05a24fed7539f861c7d725829acb196a3991923c.zip | |
Merge branch 'maint'
* maint:
xmerl: Remove 'no_return' Dialyzer warnings
xmerl: Add suppression of Dialyzer warnings
eunit: Add suppression of Dialyzer warnings
debugger: Add suppression of Dialyzer warnings
kernel: Add suppression of Dialyzer warnings
mnesia: Add suppression of Dialyzer warnings
observer: Add suppression of Dialyzer warnings
runtime_tools: Add suppression of Dialyzer warnings
stdlib: Add suppression of Dialyzer warnings
test_server: Add suppression of Dialyzer warnings
tools: Add suppression of Dialyzer warnings
Conflicts:
lib/stdlib/src/erl_lint.erl
lib/stdlib/src/otp_internal.erl
Diffstat (limited to 'lib/stdlib/src/lists.erl')
| -rw-r--r-- | lib/stdlib/src/lists.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/stdlib/src/lists.erl b/lib/stdlib/src/lists.erl index 62b6ca8a21..2b4472cdf7 100644 --- a/lib/stdlib/src/lists.erl +++ b/lib/stdlib/src/lists.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2013. All Rights Reserved. +%% Copyright Ericsson AB 1996-2016. 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. @@ -2267,6 +2267,8 @@ ukeysplit_2(I, Y, EY, [Z | L], R) -> ukeysplit_2(_I, Y, _EY, [], R) -> [Y | R]. +-dialyzer({no_improper_lists, ukeymergel/3}). + ukeymergel(I, [T1, [H2 | T2], [H3 | T3] | L], Acc) -> %% The fourth argument, [H2 | H3] (=HdM), may confuse type %% checkers. Its purpose is to ensure that the tests H2 == HdM |