aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2014-04-17 08:17:31 +0200
committerHans Bolinder <[email protected]>2014-04-17 08:17:31 +0200
commit7e826025671df768afe3fa04ed804891995df1cb (patch)
tree77d647e7e4979406bb08d4dad4abc436e69dc225 /lib/stdlib/src
parent59d1ac06229b439e3f6e494cc91ed70b1192e4d2 (diff)
parentcd0104e66c782137058d478f6d202df269f55f64 (diff)
downloadotp-7e826025671df768afe3fa04ed804891995df1cb.tar.gz
otp-7e826025671df768afe3fa04ed804891995df1cb.tar.bz2
otp-7e826025671df768afe3fa04ed804891995df1cb.zip
Merge branch 'maint'
* maint: stdlib: Fix error message when exporting (redefined) map() type
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/erl_lint.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index 7c064ce902..39cc03cf7a 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -1046,9 +1046,10 @@ check_undefined_types(#lint{usage=Usage,types=Def}=St0) ->
Used = Usage#usage.used_types,
UTAs = dict:fetch_keys(Used),
Undef = [{TA,dict:fetch(TA, Used)} ||
- TA <- UTAs,
+ {T,_}=TA <- UTAs,
not dict:is_key(TA, Def),
- not is_default_type(TA)],
+ not is_default_type(TA),
+ not is_newly_introduced_var_arity_type(T)],
foldl(fun ({TA,L}, St) ->
add_error(L, {undefined_type,TA}, St)
end, St0, Undef).