From 7986d60dac9687b3aef3115f0dccc86003a681e6 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Fri, 8 Apr 2016 12:13:57 +0200
Subject: stdlib: The type map() is built-in

---
 lib/stdlib/src/erl_lint.erl        | 9 ++-------
 lib/stdlib/test/erl_lint_SUITE.erl | 7 +++----
 2 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'lib/stdlib')

diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index 4ca9a609a8..7e5535f41e 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -2714,8 +2714,6 @@ check_type(Types, St) ->
 
 check_type({ann_type, _L, [_Var, Type]}, SeenVars, St) ->
     check_type(Type, SeenVars, St);
-check_type({paren_type, _L, [Type]}, SeenVars, St) ->
-    check_type(Type, SeenVars, St);
 check_type({remote_type, L, [{atom, _, Mod}, {atom, _, Name}, Args]},
 	   SeenVars, St0) ->
     St = deprecated_type(L, Mod, Name, Args, St0),
@@ -2755,10 +2753,8 @@ check_type({type, L, range, [From, To]}, SeenVars, St) ->
 	    _ -> add_error(L, {type_syntax, range}, St)
 	end,
     {SeenVars, St1};
-check_type({type, L, map, any}, SeenVars, St) ->
-    %% To get usage right while map/0 is a newly_introduced_builtin_type.
-    St1 = used_type({map, 0}, L, St),
-    {SeenVars, St1};
+check_type({type, _L, map, any}, SeenVars, St) ->
+    {SeenVars, St};
 check_type({type, _L, map, Pairs}, SeenVars, St) ->
     lists:foldl(fun(Pair, {AccSeenVars, AccSt}) ->
 			check_type(Pair, AccSeenVars, AccSt)
@@ -2866,7 +2862,6 @@ used_type(TypePair, L, #lint{usage = Usage, file = File} = St) ->
 is_default_type({Name, NumberOfTypeVariables}) ->
     erl_internal:is_type(Name, NumberOfTypeVariables).
 
-is_newly_introduced_builtin_type({map, 0}) -> true;
 is_newly_introduced_builtin_type({Name, _}) when is_atom(Name) -> false.
 
 is_obsolete_builtin_type(TypePair) ->
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index 29a389d4b8..6fea198af3 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -2703,9 +2703,8 @@ otp_11872(Config) when is_list(Config) ->
             t() ->
                 1.
          ">>,
-    {error,[{6,erl_lint,{undefined_type,{product,0}}},
-            {8,erl_lint,{undefined_type,{dict,0}}}],
-           [{8,erl_lint,{new_builtin_type,{map,0}}}]} =
+    {errors,[{6,erl_lint,{undefined_type,{product,0}}},
+             {8,erl_lint,{builtin_type,{map,0}}}], []} =
         run_test2(Config, Ts, []),
     ok.
 
@@ -3689,7 +3688,7 @@ maps_type(Config) when is_list(Config) ->
 	    t(M) -> M.
 	 ">>,
 	 [],
-	 {warnings,[{3,erl_lint,{new_builtin_type,{map,0}}}]}}],
+	 {errors,[{3,erl_lint,{builtin_type,{map,0}}}],[]}}],
     [] = run(Config, Ts),
     ok.
 
-- 
cgit v1.2.3