Skip to content

Commit 3a472ee

Browse files
committed
Revert "Warn on unused shadowed aliases (elixir-lang#13550)"
This reverts commit d1b3063.
1 parent 54cb1c5 commit 3a472ee

File tree

4 files changed

+3
-38
lines changed

4 files changed

+3
-38
lines changed

lib/elixir/lib/kernel/lexical_tracker.ex

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,7 @@ defmodule Kernel.LexicalTracker do
123123

124124
@doc false
125125
def handle_call(:unused_aliases, _from, state) do
126-
unused_aliases =
127-
Enum.map(state.aliases, fn
128-
{{:shadowed, module}, meta} -> {module, meta}
129-
{module, meta} when is_atom(module) -> {module, meta}
130-
end)
131-
|> Enum.sort()
132-
133-
{:reply, unused_aliases, state}
126+
{:reply, Enum.sort(state.aliases), state}
134127
end
135128

136129
def handle_call(:unused_imports, _from, state) do
@@ -227,12 +220,6 @@ defmodule Kernel.LexicalTracker do
227220

228221
def handle_cast({:add_alias, module, meta, warn}, state) do
229222
if warn do
230-
state =
231-
case state do
232-
%{aliases: %{^module => meta}} -> put_in(state.aliases[{:shadowed, module}], meta)
233-
_ -> state
234-
end
235-
236223
{:noreply, put_in(state.aliases[module], meta)}
237224
else
238225
{:noreply, state}

lib/elixir/lib/macro/env.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ defmodule Macro.Env do
447447
448448
## Examples
449449
450-
iex> alias List, as: MyList, warn: false
450+
iex> alias List, as: MyList
451451
iex> Macro.Env.expand_alias(__ENV__, [], [:MyList])
452452
{:alias, List}
453453
iex> Macro.Env.expand_alias(__ENV__, [], [:MyList, :Nested])
@@ -456,7 +456,7 @@ defmodule Macro.Env do
456456
If there is no alias or the alias starts with `Elixir.`
457457
(which disables aliasing), then `:error` is returned:
458458
459-
iex> alias List, as: MyList, warn: false
459+
iex> alias List, as: MyList
460460
iex> Macro.Env.expand_alias(__ENV__, [], [:Elixir, MyList])
461461
:error
462462
iex> Macro.Env.expand_alias(__ENV__, [], [:AnotherList])

lib/elixir/test/elixir/kernel/alias_test.exs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ defmodule Kernel.AliasTest do
3434
assert Billing == :"Elixir.MyApp.Billing"
3535
end
3636

37-
test "overriding parent alias with child alias" do
38-
alias MyApp.Billing
39-
alias Billing.Billing
40-
assert Billing == :"Elixir.MyApp.Billing.Billing"
41-
end
42-
4337
test "lexical" do
4438
if true_fun() do
4539
alias OMG, as: List, warn: false

lib/elixir/test/elixir/kernel/warning_test.exs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -894,22 +894,6 @@ defmodule Kernel.WarningTest do
894894
purge(Sample)
895895
end
896896

897-
test "unused alias due to shadowing" do
898-
assert_warn_compile(
899-
["nofile:2:3", "unused alias Baz"],
900-
"""
901-
defmodule Sample do
902-
alias Foo.Baz
903-
alias Bar.Baz
904-
905-
def baz, do: Baz
906-
end
907-
"""
908-
)
909-
after
910-
purge(Sample)
911-
end
912-
913897
test "unused inside dynamic module" do
914898
import List, only: [flatten: 1], warn: false
915899

0 commit comments

Comments
 (0)