Sort maps and environment when escaping

Author: josevalim

lib/elixir/src/elixir_expand.erl

@@ -462,7 +462,7 @@ escape_env_entries(Meta, #elixir_ex{vars={Read, _}}, Env0) ->
 
   Env1#{versioned_vars := escape_map(Read), line := ?line(Meta)}.
 
-escape_map(Map) -> {'%{}', [], maps:to_list(Map)}.
+escape_map(Map) -> {'%{}', [], lists:sort(maps:to_list(Map))}.
 
 expand_multi_alias_call(Kind, Meta, Base, Refs, Opts, S, E) ->
   {BaseRef, SB, EB} = expand_without_aliases_report(Base, S, E),

lib/elixir/src/elixir_quote.erl

@@ -144,7 +144,7 @@ do_escape(BitString, _, _) when is_bitstring(BitString) ->
   end;
 
 do_escape(Map, Q, E) when is_map(Map) ->
-  TT = do_quote(maps:to_list(Map), Q, E),
+  TT = do_quote(lists:sort(maps:to_list(Map)), Q, E),
   {'%{}', [], TT};
 
 do_escape([], _, _) -> [];