diff options
| author | Hans Bolinder <[email protected]> | 2017-11-28 12:52:29 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2017-11-28 12:52:29 +0100 |
| commit | 779ea5fecf0e0ba525410a3dcb4ea84d12b5c77f (patch) | |
| tree | 3e6faa7d134711a7ea8c7a432f8455a82ab062a5 /lib/dialyzer/test | |
| parent | 77cbfba55b7d4d4c4f50a32716b69dbd53c8415c (diff) | |
| parent | 59ca0ddeb08d6ec433fa50eaa0a7175a09766b83 (diff) | |
| download | otp-779ea5fecf0e0ba525410a3dcb4ea84d12b5c77f.tar.gz otp-779ea5fecf0e0ba525410a3dcb4ea84d12b5c77f.tar.bz2 otp-779ea5fecf0e0ba525410a3dcb4ea84d12b5c77f.zip | |
Merge branch 'maint'
* maint:
dialyzer: Extend the map implementation's handling of ?unit
dialyzer: Use string:find() instead of string:str()
Diffstat (limited to 'lib/dialyzer/test')
| -rw-r--r-- | lib/dialyzer/test/map_SUITE_data/results/map_anon_fun | 2 | ||||
| -rw-r--r-- | lib/dialyzer/test/map_SUITE_data/src/map_anon_fun.erl | 9 | ||||
| -rw-r--r-- | lib/dialyzer/test/plt_SUITE.erl | 10 |
3 files changed, 16 insertions, 5 deletions
diff --git a/lib/dialyzer/test/map_SUITE_data/results/map_anon_fun b/lib/dialyzer/test/map_SUITE_data/results/map_anon_fun new file mode 100644 index 0000000000..cfca5b1407 --- /dev/null +++ b/lib/dialyzer/test/map_SUITE_data/results/map_anon_fun @@ -0,0 +1,2 @@ + +map_anon_fun.erl:4: Function g/1 will never be called diff --git a/lib/dialyzer/test/map_SUITE_data/src/map_anon_fun.erl b/lib/dialyzer/test/map_SUITE_data/src/map_anon_fun.erl new file mode 100644 index 0000000000..e77016d68a --- /dev/null +++ b/lib/dialyzer/test/map_SUITE_data/src/map_anon_fun.erl @@ -0,0 +1,9 @@ +-module(map_anon_fun). + +%% Not exported. +g(A) -> + maps:map(fun F(K, {V, _C}) -> + F(K, V); + F(_K, _V) -> + #{ system => {A} } + end, #{}). diff --git a/lib/dialyzer/test/plt_SUITE.erl b/lib/dialyzer/test/plt_SUITE.erl index a8a9f176fc..680f5b5088 100644 --- a/lib/dialyzer/test/plt_SUITE.erl +++ b/lib/dialyzer/test/plt_SUITE.erl @@ -283,8 +283,8 @@ bad_dialyzer_attr(Config) -> {dialyzer_error, "Analysis failed with error:\n" ++ Str1} = (catch dialyzer:run(Opts)), - P1 = string:str(Str1, "dial.erl:2: function undef/0 undefined"), - true = P1 > 0, + S1 = string:find(Str1, "dial.erl:2: function undef/0 undefined"), + true = is_list(S1), Prog2 = <<"-module(dial). -dialyzer({no_return, [{undef,1,2}]}).">>, @@ -292,9 +292,9 @@ bad_dialyzer_attr(Config) -> {dialyzer_error, "Analysis failed with error:\n" ++ Str2} = (catch dialyzer:run(Opts)), - P2 = string:str(Str2, "dial.erl:2: badly formed dialyzer " - "attribute: {no_return,{undef,1,2}}"), - true = P2 > 0, + S2 = string:find(Str2, "dial.erl:2: badly formed dialyzer " + "attribute: {no_return,{undef,1,2}}"), + true = is_list(S2), ok. |