Skip to content

Commit 129c5be

Browse files
committed
Decouple require expansion from alias
1 parent dab3d22 commit 129c5be

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/elixir/src/elixir_expand.erl

+3-3
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ expand({require, Meta, [Ref, Opts]}, S, E) ->
9494

9595
false when is_atom(ERef) ->
9696
elixir_aliases:ensure_loaded(Meta, ERef, ET),
97-
{ERef, ST, expand_require(Meta, ERef, EOpts, ET)};
97+
RE = expand_require(Meta, ERef, EOpts, ET),
98+
{ERef, ST, expand_alias(Meta, false, ERef, EOpts, RE)};
9899

99100
false ->
100101
file_error(Meta, E, ?MODULE, {expected_compile_time_module, require, Ref})
@@ -984,8 +985,7 @@ no_alias_expansion(Other) ->
984985

985986
expand_require(Meta, Ref, Opts, E) ->
986987
elixir_env:trace({require, Meta, Ref, Opts}, E),
987-
RE = E#{requires := ordsets:add_element(Ref, ?key(E, requires))},
988-
expand_alias(Meta, false, Ref, Opts, RE).
988+
E#{requires := ordsets:add_element(Ref, ?key(E, requires))}.
989989

990990
expand_alias(Meta, IncludeByDefault, Ref, Opts, E) ->
991991
case expand_as(lists:keyfind(as, 1, Opts), Meta, IncludeByDefault, Ref, E) of

0 commit comments

Comments
 (0)