aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src/lists.erl
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2016-02-17 09:19:08 +0100
committerHans Bolinder <[email protected]>2016-02-17 09:19:08 +0100
commit0d5820c44dde5875d322a84eab6ce4227fe19bec (patch)
tree1b25d01a0c7cc5dc53f89dcbbf7a5eb891b5d7a6 /lib/stdlib/src/lists.erl
parentf6743c5263b67013951f36e56d942d7d89ba8ba2 (diff)
parent3270b7f32c71bf8f7637a61a09dd0e9a2dbfc8d1 (diff)
downloadotp-0d5820c44dde5875d322a84eab6ce4227fe19bec.tar.gz
otp-0d5820c44dde5875d322a84eab6ce4227fe19bec.tar.bz2
otp-0d5820c44dde5875d322a84eab6ce4227fe19bec.zip
Merge branch 'hb/add_dialyzer_suppressions/OTP-12862' into maint
* hb/add_dialyzer_suppressions/OTP-12862: 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
Diffstat (limited to 'lib/stdlib/src/lists.erl')
-rw-r--r--lib/stdlib/src/lists.erl4
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