Merge branch 'hasse/no_dots_in_map_types/PR-1014'

* hasse/no_dots_in_map_types/PR-1014:
  Remove support for '...' in Maps types

3 files changed, 3 insertions, 25 deletions

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.