diff options
| author | Erlang/OTP <[email protected]> | 2010-06-09 14:52:17 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-06-09 14:53:51 +0200 |
| commit | c90f8274fcc2f9d5fdd878f19dabbfea2024656f (patch) | |
| tree | 3af7df6e0c46efe0f9eb9d07c464c2a7e5da8178 /lib/stdlib/test/erl_lint_SUITE.erl | |
| parent | c073122f207e71ebc02b31138b53bfd55a28ff44 (diff) | |
| parent | 144aa23315abc5954aa34e9df50617da735ed366 (diff) | |
| download | otp-c90f8274fcc2f9d5fdd878f19dabbfea2024656f.tar.gz otp-c90f8274fcc2f9d5fdd878f19dabbfea2024656f.tar.bz2 otp-c90f8274fcc2f9d5fdd878f19dabbfea2024656f.zip | |
Merge branch 'pan/otp_8683_compiler_warnings' into HEAD
* pan/otp_8683_compiler_warnings:
Remove (harmless) warning regarding auto-imported BIF max/2
Update primary bootstrap
Correct warnings and errors for auto-imported bif clashes
Conflicts:
bootstrap/lib/stdlib/ebin/erl_lint.beam
Diffstat (limited to 'lib/stdlib/test/erl_lint_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/erl_lint_SUITE.erl | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl index 01f494ee38..d0c0d68b4a 100644 --- a/lib/stdlib/test/erl_lint_SUITE.erl +++ b/lib/stdlib/test/erl_lint_SUITE.erl @@ -2252,7 +2252,7 @@ otp_5878(Config) when is_list(Config) -> {15,erl_lint,{undefined_field,r3,q}}, {17,erl_lint,{undefined_field,r,q}}, {21,erl_lint,illegal_guard_expr}, - {23,erl_lint,illegal_guard_expr}], + {23,erl_lint,{illegal_guard_local_call,{l,0}}}], []} = run_test2(Config, Ill1, [warn_unused_record]), @@ -2492,7 +2492,7 @@ bif_clash(Config) when is_list(Config) -> binary:part(B,X,Y). ">>, [], - {errors,[{3,erl_lint,illegal_guard_expr}],[]}}, + {errors,[{3,erl_lint,{illegal_guard_local_call,{binary_part,2}}}],[]}}, %% no_auto_import is not like nowarn_bif_clash, it actually removes the autoimport {clash9, <<"-export([x/1]). @@ -2599,7 +2599,16 @@ bif_clash(Config) when is_list(Config) -> binary_part(A,B,C+1). ">>, [], - {errors,[{4,erl_lint,illegal_guard_expr}],[]}} + {errors,[{4,erl_lint,illegal_guard_expr}],[]}}, + %% Not with local functions either + {clash20, + <<"-export([binary_port/3]). + -import(x,[binary_part/3]). + binary_port(A,B,C) -> + binary_part(A,B,C). + ">>, + [warn_unused_import], + {warnings,[{2,erl_lint,{redefine_bif_import,{binary_part,3}}}]}} ], ?line [] = run(Config, Ts), |