aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src/erl_lint.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2012-02-09 12:02:06 +0100
committerBjörn Gustavsson <[email protected]>2012-02-09 12:02:06 +0100
commit34c972456ec18bf48a655ffe9d959b708053f6a0 (patch)
treef22400818753596ff2e9656461ef54343dc4e76c /lib/stdlib/src/erl_lint.erl
parent2907d80221da3455137aaabe92aad77411113e84 (diff)
parentad4a6862a45258b605ab7a799a5cc15c57f6f807 (diff)
downloadotp-34c972456ec18bf48a655ffe9d959b708053f6a0.tar.gz
otp-34c972456ec18bf48a655ffe9d959b708053f6a0.tar.bz2
otp-34c972456ec18bf48a655ffe9d959b708053f6a0.zip
Merge branch 'bjorn/remove-is_constant-vestiges/OTP-6454' into maint
* bjorn/remove-is_constant-vestiges/OTP-6454: HiPE: Remove support for is_constant/1 erl_lint: Remove handling of constant/1 erl_bif_types: Remove type for is_constant/1 erl_eval: Remove support for is_constant/1 Remove support for is_constant/1 in ms_transform Remove references to is_constant/1 from the match spec documentation
Diffstat (limited to 'lib/stdlib/src/erl_lint.erl')
-rw-r--r--lib/stdlib/src/erl_lint.erl12
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index cfbcf54d95..a1af0057ca 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -3436,17 +3436,11 @@ obsolete_guard({call,Line,{atom,Lr,F},As}, St0) ->
false ->
deprecated_function(Line, erlang, F, As, St0);
true ->
- St1 = case F of
- constant ->
- deprecated_function(Lr, erlang, is_constant, As, St0);
- _ ->
- St0
- end,
- case is_warn_enabled(obsolete_guard, St1) of
+ case is_warn_enabled(obsolete_guard, St0) of
true ->
- add_warning(Lr,{obsolete_guard, {F, Arity}}, St1);
+ add_warning(Lr,{obsolete_guard, {F, Arity}}, St0);
false ->
- St1
+ St0
end
end;
obsolete_guard(_G, St) ->