From 04127a01414ba83ba7c1a931783f232bcc0a7790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Sat, 18 Feb 2023 14:36:42 +0100
Subject: asn1: Use map comprehensions

---
 lib/asn1/src/asn1ct_check.erl     | 5 ++---
 lib/asn1/src/asn1ct_gen_check.erl | 4 ++--
 lib/asn1/src/asn1ct_gen_jer.erl   | 7 +++----
 lib/asn1/src/asn1rtt_ext.erl      | 4 +---
 4 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'lib/asn1')

diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index 12db184b4e..a6d9da9977 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -2294,9 +2294,8 @@ use_maps(#state{options=Opts}) ->
 
 create_map_value(Components, ListOfVals) ->
     Zipped = lists:zip(Components, ListOfVals),
-    L = [{Name,V} || {#'ComponentType'{name=Name},V} <- Zipped,
-                     V =/= asn1_NOVALUE],
-    maps:from_list(L).
+    #{Name => V || {#'ComponentType'{name=Name},V} <- Zipped,
+                   V =/= asn1_NOVALUE}.
 
 normalize_seq_or_set(SorS, S,
 		     [{#seqtag{val=Cname},V}|Vs],
diff --git a/lib/asn1/src/asn1ct_gen_check.erl b/lib/asn1/src/asn1ct_gen_check.erl
index 4996491fa7..4b57494bd4 100644
--- a/lib/asn1/src/asn1ct_gen_check.erl
+++ b/lib/asn1/src/asn1ct_gen_check.erl
@@ -167,8 +167,8 @@ do_seq_set(#gen{pack=map}=Gen, Cs0, Default) ->
                             end, Cs),
     case AllLiterals of
 	true ->
-            L = [{Name,Lit} || {Name,{literal,Lit}} <- Cs],
-	    {literal,maps:from_list(L)};
+            M = #{Name => Lit || {Name,{literal,Lit}} <- Cs},
+            {literal,M};
 	false ->
 	    Key = {Cs,Default},
 	    DoGen = fun(Fd, Name) ->
diff --git a/lib/asn1/src/asn1ct_gen_jer.erl b/lib/asn1/src/asn1ct_gen_jer.erl
index 7f6152ad80..cd073599bf 100644
--- a/lib/asn1/src/asn1ct_gen_jer.erl
+++ b/lib/asn1/src/asn1ct_gen_jer.erl
@@ -159,10 +159,9 @@ gen_encode_choice(Erules,TypeName,D) when is_record(D,type) ->
 		    {Rl,El} -> Rl ++ El;
 		    _ -> CompList
 		end,
-    {choice,maps:from_list(
-              [{AltName,AltType}||
-                  {AltName,AltType,_OptOrMand} <- 
-                      gen_enc_comptypes(Erules,TypeName,CompList1,0,0,[])])}.
+    {choice,#{AltName => AltType ||
+                {AltName,AltType,_OptOrMand} <-
+                    gen_enc_comptypes(Erules,TypeName,CompList1,0,0,[])}}.
 
 gen_decode_choice(_,_,_) -> ok.
 
diff --git a/lib/asn1/src/asn1rtt_ext.erl b/lib/asn1/src/asn1rtt_ext.erl
index f028e33888..2ed0bb47c2 100644
--- a/lib/asn1/src/asn1rtt_ext.erl
+++ b/lib/asn1/src/asn1rtt_ext.erl
@@ -127,7 +127,5 @@ transform_to_EXTERNAL1994_maps(V0) ->
 	_  ->
 	    %% Keep the EXTERNAL 1990 definition to avoid losing
 	    %% information.
-	    V = [{K,V} || {K,V} <- maps:to_list(V0),
-                          V =/= asn1_NOVALUE],
-            maps:from_list(V)
+            #{K => V || K := V <- V0, V =/= asn1_NOVALUE}
     end.
-- 
cgit v1.2.1