From baf80f03d623bc995183da5347eef2ac5ef3a29a Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Tue, 29 Apr 2014 10:11:14 +0200
Subject: Remove pre-defined types dict(), digraph(), &c

The pre-defined types array(), dict(), digraph(), gb_set(), gb_tree(),
queue(), set(), and tid() have been removed.
---
 lib/stdlib/src/erl_internal.erl |  8 --------
 lib/stdlib/src/erl_lint.erl     | 20 +++-----------------
 2 files changed, 3 insertions(+), 25 deletions(-)

(limited to 'lib/stdlib/src')

diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl
index 5e6391da1f..e523b6b476 100644
--- a/lib/stdlib/src/erl_internal.erl
+++ b/lib/stdlib/src/erl_internal.erl
@@ -540,7 +540,6 @@ old_bif(Name, A) when is_atom(Name), is_integer(A) -> false.
 
 is_type(any, 0) -> true;
 is_type(arity, 0) -> true;
-is_type(array, 0) -> true; % To be removed.
 is_type(atom, 0) -> true;
 is_type(binary, 0) -> true;
 is_type(bitstring, 0) -> true;
@@ -548,12 +547,8 @@ is_type(bool, 0) -> true;
 is_type(boolean, 0) -> true;
 is_type(byte, 0) -> true;
 is_type(char, 0) -> true;
-is_type(dict, 0) -> true; % To be removed.
-is_type(digraph, 0) -> true; % To be removed.
 is_type(float, 0) -> true;
 is_type(function, 0) -> true;
-is_type(gb_set, 0) -> true; % To be removed.
-is_type(gb_tree, 0) -> true; % To be removed.
 is_type(identifier, 0) -> true;
 is_type(integer, 0) -> true;
 is_type(iodata, 0) -> true;
@@ -581,12 +576,9 @@ is_type(number, 0) -> true;
 is_type(pid, 0) -> true;
 is_type(port, 0) -> true;
 is_type(pos_integer, 0) -> true;
-is_type(queue, 0) -> true; % To be removed.
 is_type(reference, 0) -> true;
-is_type(set, 0) -> true; % To be removed.
 is_type(string, 0) -> true;
 is_type(term, 0) -> true;
-is_type(tid, 0) -> true; % To be removed.
 is_type(timeout, 0) -> true;
 is_type(tuple, 0) -> true;
 is_type(_, _) -> false.
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index 10ed9c27e1..f34c3b5c7b 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -2852,23 +2852,9 @@ is_newly_introduced_builtin_type({Name, _}) when is_atom(Name) -> false.
 is_obsolete_builtin_type(TypePair) ->
     obsolete_builtin_type(TypePair) =/= no.
 
-%% Obsolete in OTP 17.0.
-obsolete_builtin_type({array, 0}) ->
-    {deprecated, {array, array, 1}, "OTP 18.0"};
-obsolete_builtin_type({dict, 0}) ->
-    {deprecated, {dict, dict, 2}, "OTP 18.0"};
-obsolete_builtin_type({digraph, 0}) ->
-    {deprecated, {digraph, graph}, "OTP 18.0"};
-obsolete_builtin_type({gb_set, 0}) ->
-    {deprecated, {gb_sets, set, 1}, "OTP 18.0"};
-obsolete_builtin_type({gb_tree, 0}) ->
-    {deprecated, {gb_trees, tree, 2}, "OTP 18.0"};
-obsolete_builtin_type({queue, 0}) ->
-    {deprecated, {queue, queue, 1}, "OTP 18.0"};
-obsolete_builtin_type({set, 0}) ->
-    {deprecated, {sets, set, 1}, "OTP 18.0"};
-obsolete_builtin_type({tid, 0}) ->
-    {deprecated, {ets, tid}, "OTP 18.0"};
+%% To keep Dialyzer silent...
+obsolete_builtin_type({1, 255}) ->
+    {deprecated, {2, 255}, ""};
 obsolete_builtin_type({Name, A}) when is_atom(Name), is_integer(A) -> no.
 
 %% spec_decl(Line, Fun, Types, State) -> State.
-- 
cgit v1.2.3