diff options
author | Hans Bolinder <[email protected]> | 2014-02-13 08:19:37 +0100 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2014-02-13 08:19:37 +0100 |
commit | ee84fa8ab4debda0670717f6a3cf3c31b790a2a2 (patch) | |
tree | d81d77cd352ffbab91c9d12e2017064da34359e6 /lib | |
parent | f5d45cf6e21ee115f877a193ce57152779438a88 (diff) | |
parent | f43fb209d5f5452df9be505f64a29dbe6ac43b33 (diff) | |
download | otp-ee84fa8ab4debda0670717f6a3cf3c31b790a2a2.tar.gz otp-ee84fa8ab4debda0670717f6a3cf3c31b790a2a2.tar.bz2 otp-ee84fa8ab4debda0670717f6a3cf3c31b790a2a2.zip |
Merge branch 'hb/fix_unmatched_returns'
* hb/fix_unmatched_returns:
Fix a few of Dialyzer's unmatched_return warnings
Diffstat (limited to 'lib')
-rw-r--r-- | lib/edoc/src/edoc_tags.erl | 2 | ||||
-rw-r--r-- | lib/kernel/src/application.erl | 4 | ||||
-rw-r--r-- | lib/parsetools/src/yecc.erl | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/edoc/src/edoc_tags.erl b/lib/edoc/src/edoc_tags.erl index 74702102f0..264a533a52 100644 --- a/lib/edoc/src/edoc_tags.erl +++ b/lib/edoc/src/edoc_tags.erl @@ -454,7 +454,7 @@ check_type(#tag{line = L, data = Data}, P0, Ls, Ts) -> check_type(#t_def{type = Type}, P, Ls, Ts) -> check_type(Type, P, Ls, Ts); check_type(#t_type{name = Name, args = Args}, P, Ls, Ts) -> - check_used_type(Name, Args, P, Ls), + _ = check_used_type(Name, Args, P, Ls), check_types3(Args++Ts, P, Ls); check_type(#t_var{}, P, Ls, Ts) -> check_types3(Ts, P, Ls); diff --git a/lib/kernel/src/application.erl b/lib/kernel/src/application.erl index 4e8ba1b78a..c3bf1ac012 100644 --- a/lib/kernel/src/application.erl +++ b/lib/kernel/src/application.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2013. All Rights Reserved. +%% Copyright Ericsson AB 1996-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -132,7 +132,7 @@ ensure_all_started(Application, Type) -> {ok, Started} -> {ok, lists:reverse(Started)}; {error, Reason, Started} -> - [stop(App) || App <- Started], + _ = [stop(App) || App <- Started], {error, Reason} end. diff --git a/lib/parsetools/src/yecc.erl b/lib/parsetools/src/yecc.erl index b698beb558..f4657663e6 100644 --- a/lib/parsetools/src/yecc.erl +++ b/lib/parsetools/src/yecc.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2013. All Rights Reserved. +%% Copyright Ericsson AB 1996-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -423,7 +423,7 @@ infile(Parent, Infilex, Options) -> end, case {St#yecc.errors, werror(St)} of {[], false} -> ok; - _ -> _ = file:delete(St#yecc.outfile) + _ -> _ = file:delete(St#yecc.outfile), ok end, Parent ! {self(), yecc_ret(St)}. |