Remove support for '...' in Maps types

It is possible that '...' is added later (OTP 20.0), but for now we
are not sure of all details.

16 files changed, 37 insertions, 110 deletions

diff --git a/lib/dialyzer/test/map_SUITE_data/results/exact b/lib/dialyzer/test/map_SUITE_data/results/exact
index 374ada8869..ea00e61330 100644
--- a/lib/dialyzer/test/map_SUITE_data/results/exact
+++ b/lib/dialyzer/test/map_SUITE_data/results/exact
@@ -1,3 +1,3 @@
 
 exact.erl:15: Function t2/1 has no local return
-exact.erl:19: The variable _ can never match since previous clauses completely covered the type #{'a':=_, ...}
+exact.erl:19: The variable _ can never match since previous clauses completely covered the type #{'a':=_, _=>_}
diff --git a/lib/dialyzer/test/map_SUITE_data/results/guard_update b/lib/dialyzer/test/map_SUITE_data/results/guard_update
index e4bc892195..98df23907f 100644
--- a/lib/dialyzer/test/map_SUITE_data/results/guard_update
+++ b/lib/dialyzer/test/map_SUITE_data/results/guard_update
@@ -1,5 +1,5 @@
 
 guard_update.erl:5: Function t/0 has no local return
-guard_update.erl:6: The call guard_update:f(#{'a':=2}) will never return since it differs in the 1st argument from the success typing arguments: (#{'b':=_, ...})
+guard_update.erl:6: The call guard_update:f(#{'a':=2}) will never return since it differs in the 1st argument from the success typing arguments: (#{'b':=_, _=>_})
 guard_update.erl:8: Clause guard cannot succeed. The variable M was matched against the type #{'a':=2}
 guard_update.erl:8: Function f/1 has no local return
diff --git a/lib/dialyzer/test/map_SUITE_data/results/map_in_guard2 b/lib/dialyzer/test/map_SUITE_data/results/map_in_guard2
index 6bc0c010d7..f6fb98a863 100644
--- a/lib/dialyzer/test/map_SUITE_data/results/map_in_guard2
+++ b/lib/dialyzer/test/map_SUITE_data/results/map_in_guard2
@@ -1,7 +1,7 @@
 
 map_in_guard2.erl:10: The call map_in_guard2:assoc_guard_clause('not_a_map') will never return since it differs in the 1st argument from the success typing arguments: (map())
 map_in_guard2.erl:12: The pattern 'true' can never match the type 'false'
-map_in_guard2.erl:14: The call map_in_guard2:exact_guard_clause(#{}) will never return since it differs in the 1st argument from the success typing arguments: (#{'a':=_, ...})
+map_in_guard2.erl:14: The call map_in_guard2:exact_guard_clause(#{}) will never return since it differs in the 1st argument from the success typing arguments: (#{'a':=_, _=>_})
 map_in_guard2.erl:17: Clause guard cannot succeed. The variable M was matched against the type 'not_a_map'
 map_in_guard2.erl:20: Function assoc_update/1 has no local return
 map_in_guard2.erl:20: Guard test is_map(M::'not_a_map') can never succeed
diff --git a/lib/dialyzer/test/map_SUITE_data/results/typeflow b/lib/dialyzer/test/map_SUITE_data/results/typeflow
index e3378a24bb..acfb7f551e 100644
--- a/lib/dialyzer/test/map_SUITE_data/results/typeflow
+++ b/lib/dialyzer/test/map_SUITE_data/results/typeflow
@@ -1,4 +1,4 @@
 
 typeflow.erl:14: Function t2/1 has no local return
 typeflow.erl:16: The call lists:sort(integer()) will never return since it differs in the 1st argument from the success typing arguments: ([any()])
-typeflow.erl:9: The variable _ can never match since previous clauses completely covered the type #{'a':=integer(), ...}
+typeflow.erl:9: The variable _ can never match since previous clauses completely covered the type #{'a':=integer(), _=>_}
diff --git a/lib/dialyzer/test/map_SUITE_data/results/typesig b/lib/dialyzer/test/map_SUITE_data/results/typesig
index 3049402860..fb2f851a7d 100644
--- a/lib/dialyzer/test/map_SUITE_data/results/typesig
+++ b/lib/dialyzer/test/map_SUITE_data/results/typesig
@@ -1,5 +1,5 @@
 
 typesig.erl:5: Function t1/0 has no local return
-typesig.erl:5: The call typesig:test(#{'a':=1}) will never return since it differs in the 1st argument from the success typing arguments: (#{'a':={number()}, ...})
+typesig.erl:5: The call typesig:test(#{'a':=1}) will never return since it differs in the 1st argument from the success typing arguments: (#{'a':={number()}, _=>_})
 typesig.erl:6: Function t2/0 has no local return
-typesig.erl:6: The call typesig:test(#{'a':={'b'}}) will never return since it differs in the 1st argument from the success typing arguments: (#{'a':={number()}, ...})
+typesig.erl:6: The call typesig:test(#{'a':={'b'}}) will never return since it differs in the 1st argument from the success typing arguments: (#{'a':={number()}, _=>_})
diff --git a/lib/dialyzer/test/small_SUITE_data/results/maps1 b/lib/dialyzer/test/small_SUITE_data/results/maps1
index a178e96b20..f36f7f4926 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/maps1
+++ b/lib/dialyzer/test/small_SUITE_data/results/maps1
@@ -1,4 +1,4 @@
 
 maps1.erl:43: Function t3/0 has no local return
-maps1.erl:44: The call maps1:foo(#{'greger'=>3, #{'arne'=>'anka'}=>45},1) will never return since it differs in the 1st and 2nd argument from the success typing arguments: (#{'beta':=_, ...},'b')
+maps1.erl:44: The call maps1:foo(#{'greger'=>3, #{'arne'=>'anka'}=>45},1) will never return since it differs in the 1st and 2nd argument from the success typing arguments: (#{'beta':=_, _=>_},'b')
 maps1.erl:52: The variable Mod can never match since previous clauses completely covered the type #{}
diff --git a/lib/edoc/src/edoc_layout.erl b/lib/edoc/src/edoc_layout.erl
index e86d090b13..ef57b7b084 100644
--- a/lib/edoc/src/edoc_layout.erl
+++ b/lib/edoc/src/edoc_layout.erl
@@ -901,17 +901,11 @@ t_map(Es) ->
 t_map_field(#xmlElement{content = [K,V]}=E) ->
     KElem = t_utype_elem(K),
     VElem = t_utype_elem(V),
-    AT = get_attrval(assoc_type, E),
-    IsAny = fun(["any","()"]) -> true; (_) -> false end,
-    case AT =:= "assoc" andalso IsAny(KElem) andalso IsAny(VElem) of
-        true -> "...";
-        false ->
-            AS = case AT of
-                     "assoc" -> " => ";
-                     "exact" -> " := "
-                 end,
-            KElem ++ [AS] ++ VElem
-    end.
+    AS = case get_attrval(assoc_type, E) of
+             "assoc" -> " => ";
+             "exact" -> " := "
+         end,
+    KElem ++ [AS] ++ VElem.
 
 t_record(E, Es) ->
     Name = ["#"] ++ t_type(get_elem(atom, Es)),
diff --git a/lib/edoc/src/edoc_parser.yrl b/lib/edoc/src/edoc_parser.yrl
index 983e2f8496..68a3439f10 100644
--- a/lib/edoc/src/edoc_parser.yrl
+++ b/lib/edoc/src/edoc_parser.yrl
@@ -82,9 +82,6 @@ utype_map_field -> utype '=>' utype : #t_map_field{assoc_type = assoc,
 utype_map_field -> utype ':=' utype : #t_map_field{assoc_type = exact,
                                                    k_type = '$1',
                                                    v_type = '$3'}.
-utype_map_field -> '...' : #t_map_field{assoc_type = assoc,
-                                        k_type = any(),
-                                        v_type = any()}.
 
 utype_tuple -> '{' utypes '}' : lists:reverse('$2').
 
@@ -354,9 +351,6 @@ all_vars([#t_var{} | As]) ->
 all_vars(As) ->
     As =:= [].
 
-any() ->
-    #t_type{name = #t_name{name = any}, args = []}.
-
 %% ---------------------------------------------------------------------
 
 %% @doc EDoc type specification parsing. Parses the content of
diff --git a/lib/erl_docgen/src/docgen_otp_specs.erl b/lib/erl_docgen/src/docgen_otp_specs.erl
index 5bc3be7a8d..6c41147e27 100644
--- a/lib/erl_docgen/src/docgen_otp_specs.erl
+++ b/lib/erl_docgen/src/docgen_otp_specs.erl
@@ -446,17 +446,11 @@ t_map(Es) ->
 t_map_field(#xmlElement{content = [K,V]}=E) ->
     KElem = t_utype_elem(K),
     VElem = t_utype_elem(V),
-    AT = get_attrval(assoc_type, E),
-    IsAny = fun(["any","()"]) -> true; (_) -> false end,
-    case AT =:= "assoc" andalso IsAny(KElem) andalso IsAny(VElem) of
-        true -> "...";
-        false ->
-            AS = case AT of
-                     "assoc" -> " => ";
-                     "exact" -> " := "
-                 end,
-            KElem ++ [AS] ++ VElem
-    end.
+    AS = case get_attrval(assoc_type, E) of
+             "assoc" -> " => ";
+             "exact" -> " := "
+         end,
+    KElem ++ [AS] ++ VElem.
 
 t_record(E, Es) ->
     Name = ["#"] ++ t_type(get_elem(atom, Es)),
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index c383541020..705fc73613 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -4302,7 +4302,6 @@ t_to_string(?map(Pairs0,DefK,DefV), RecDict) ->
   {Pairs, ExtraEl} =
     case {DefK, DefV} of
       {?none, ?none} -> {Pairs0, []};
-      {?any, ?any} -> {Pairs0, ["..."]};
       _ -> {Pairs0 ++ [{DefK,?opt,DefV}], []}
     end,
   Tos = fun(T) -> case T of
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index a896de4f1c..1de09aae62 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -170,9 +170,6 @@ fun_type -> '(' top_types ')' '->' top_type
                                    : {type, ?anno('$1'), 'fun',
                                       [{type, ?anno('$1'), product, '$2'},'$5']}.
 
-map_pair_types  -> '...'           : [{type, ?anno('$1'), map_field_assoc,
-                                       [{type, ?anno('$1'), any, []},
-                                        {type, ?anno('$1'), any, []}]}].
 map_pair_types -> map_pair_type                    : ['$1'].
 map_pair_types -> map_pair_type ',' map_pair_types : ['$1'|'$3'].
 
diff --git a/lib/stdlib/src/erl_pp.erl b/lib/stdlib/src/erl_pp.erl
index ca764675fc..4009300a32 100644
--- a/lib/stdlib/src/erl_pp.erl
+++ b/lib/stdlib/src/erl_pp.erl
@@ -344,27 +344,9 @@ binary_type(I1, I2) ->
 map_type(Fs) ->
     {first,[$#],map_pair_types(Fs)}.
 
-map_pair_types(Fs0) ->
-    Fs = replace_any_map(Fs0),
+map_pair_types(Fs) ->
     tuple_type(Fs, fun map_pair_type/2).
 
-replace_any_map([{type,Line,map_field_assoc,[KType,VType]}]=Fs) ->
-    IsAny = fun({type,_,any,[]}) -> true;
-    %%         ({var,_,'_'}) -> true;
-               (_) -> false
-            end,
-    case IsAny(KType) andalso IsAny(VType) of
-        true ->
-            [{type,Line,map_field_assoc,any}];
-        false ->
-            Fs
-    end;
-replace_any_map([F|Fs]) ->
-    [F|replace_any_map(Fs)];
-replace_any_map([]) -> [].
-
-map_pair_type({type,_Line,map_field_assoc,any}, _Prec) ->
-    leaf("...");
 map_pair_type({type,_Line,map_field_assoc,[KType,VType]}, Prec) ->
     {list,[{cstep,[ltype(KType, Prec),leaf(" =>")],ltype(VType, Prec)}]};
 map_pair_type({type,_Line,map_field_exact,[KType,VType]}, Prec) ->
diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl
index a48ba7b5b7..951a17d3eb 100644
--- a/lib/stdlib/test/erl_pp_SUITE.erl
+++ b/lib/stdlib/test/erl_pp_SUITE.erl
@@ -1112,15 +1112,14 @@ pr_1014(Config) ->
     ok = pp_forms(<<"-type t() :: #{any() => _}. ">>),
     ok = pp_forms(<<"-type t() :: #{_ => any()}. ">>),
     ok = pp_forms(<<"-type t() :: #{any() => any()}. ">>),
-    ok = pp_forms(<<"-type t() :: #{...}. ">>),
-    ok = pp_forms(<<"-type t() :: #{atom() := integer(), ...}. ">>),
+    ok = pp_forms(<<"-type t() :: #{atom() := integer(), any() => any()}. ">>),
 
     FileName = filename('pr_1014.erl', Config),
     C = <<"-module pr_1014.\n"
           "-compile export_all.\n"
           "-type m() :: #{..., a := integer()}.\n">>,
     ok = file:write_file(FileName, C),
-    {error,[{_,[{3,erl_parse,["syntax error before: ","','"]}]}],_} =
+    {error,[{_,[{3,erl_parse,["syntax error before: ","'...'"]}]}],_} =
         compile:file(FileName, [return]),
 
     ok.
diff --git a/lib/syntax_tools/src/erl_prettypr.erl b/lib/syntax_tools/src/erl_prettypr.erl
index 119d375746..f1615b2610 100644
--- a/lib/syntax_tools/src/erl_prettypr.erl
+++ b/lib/syntax_tools/src/erl_prettypr.erl
@@ -1130,13 +1130,14 @@ lay_2(Node, Ctxt) ->
                 any_size ->
                     text("map()");
                 Fs ->
-                    {Prec, _PrecR} = type_preop_prec('#'),
-                    Es = lay_map_fields(Fs,
-                                        floating(text(",")),
-                                        reset_prec(Ctxt)),
+                    Ctxt1 = reset_prec(Ctxt),
+                    Es = seq(Fs,
+                             floating(text(",")), Ctxt1,
+                             fun lay/2),
                     D = beside(floating(text("#{")),
                                beside(par(Es),
                                       floating(text("}")))),
+                    {Prec, _PrecR} = type_preop_prec('#'),
                     maybe_parentheses(D, Prec, Ctxt)
             end;
 
@@ -1400,36 +1401,6 @@ lay_error_info(T, Ctxt) ->
 lay_concrete(T, Ctxt) ->
     lay(erl_syntax:abstract(T), Ctxt).
 
-lay_map_fields([H | T], Separator, Ctxt) ->
-    case T of
-	[] ->
-            [case erl_syntax:type(H) of
-                 map_type_assoc ->
-                     lay_last_type_assoc(H, Ctxt);
-                 _ ->
-                     lay(H, Ctxt)
-             end];
-	_ ->
-	    [maybe_append(Separator, lay(H, Ctxt))
-	     | lay_map_fields(T, Separator, Ctxt)]
-    end;
-lay_map_fields([], _, _) ->
-    [empty()].
-
-lay_last_type_assoc(Node, Ctxt) ->
-    Name = erl_syntax:map_type_assoc_name(Node),
-    Value = erl_syntax:map_type_assoc_value(Node),
-    IsAny = fun({type,_,any,[]}) -> true;
-               %% ({var,_,'_'}) -> true;
-               (_) -> false
-            end,
-    case IsAny(Name) andalso IsAny(Value) of
-        true ->
-            text("...");
-        false ->
-            lay_type_assoc(Name, Value, Ctxt)
-    end.
-
 lay_type_assoc(Name, Value, Ctxt) ->
     Ctxt1 = reset_prec(Ctxt),
     D1 = lay(Name, Ctxt1),
diff --git a/lib/syntax_tools/test/syntax_tools_SUITE_data/type_specs.erl b/lib/syntax_tools/test/syntax_tools_SUITE_data/type_specs.erl
index 5621d3a293..e4f8a1c3de 100644
--- a/lib/syntax_tools/test/syntax_tools_SUITE_data/type_specs.erl
+++ b/lib/syntax_tools/test/syntax_tools_SUITE_data/type_specs.erl
@@ -49,9 +49,12 @@
 
 -type m1() :: #{} | map().
 -type m2() :: #{a := m1(), b => #{} | fy:m2()}.
--type m3() :: #{...}.
--type m4() :: #{_ => _, ...}.
--type m5() :: #{any() => any(), ...}. % Currently printed as `#{..., ...}'.
+%-type m3() :: #{...}.
+%-type m4() :: #{_ => _, ...}.
+%-type m5() :: #{any() => any(), ...}.
+-type m3() :: #{any() => any()}.
+-type m4() :: #{_ => _, any() => any()}.
+-type m5() :: #{any() => any(), any() => any()}.
 -type b1() :: B1 :: binary() | (BitString :: bitstring()).
 
 -define(PAIR(A, B), {(A), (B)}).
diff --git a/system/doc/reference_manual/typespec.xml b/system/doc/reference_manual/typespec.xml
index 9e26e9058d..f17e5df277 100644
--- a/system/doc/reference_manual/typespec.xml
+++ b/system/doc/reference_manual/typespec.xml
@@ -142,7 +142,7 @@
   PairList :: Pair
             | Pair, PairList
 
-  Pair :: Type := Type                         %% notes a pair that must be present
+  Pair :: Type := Type                         %% denotes a pair that must be present
         | Type => Type
 
   TList :: Type
@@ -174,19 +174,13 @@
   </p>
   <p>
     The general form of maps is <c>#{PairList}</c>. The key types in
-    <c>PairList</c> are allowed to overlap, and if they do, the leftmost pair
-    takes precedence. A map value does not belong to this type if contains a key
-    that is not in <c>PairList</c>.
+    <c>PairList</c> are allowed to overlap, and if they do, the
+    leftmost pair takes precedence. A map pair has a key in
+    <c>PairList</c> if it belongs to this type.
   </p>
   <p>
-    Because it is common to end a map type with <c>any() =&gt; any()</c> to denote
-    that keys that do not belong to any other pair in <c>PairList</c> are
-    allowed, and may map to any value, the shorthand notation <c>...</c> is
-    allowed as the last pair of a map type.
-  </p>
-  <p>
-    Notice that the syntactic representation of <c>map()</c> is <c>#{...}</c>
-    (or <c>#{_ =&gt; _}</c>, or <c>#{any() =&gt; any()}</c>), not <c>#{}</c>.
+    Notice that the syntactic representation of <c>map()</c> is
+    <c>#{any() =&gt; any()}</c> (or <c>#{_ =&gt; _}</c>), not <c>#{}</c>.
     The notation <c>#{}</c> specifies the singleton type for the empty map.
   </p>
   <p>