Skip to content

Commit aaa0100

Browse files
committed
Re-use Sample
1 parent ba95908 commit aaa0100

File tree

3 files changed

+5
-18
lines changed

3 files changed

+5
-18
lines changed

lib/elixir/test/elixir/fixtures/consolidation/extra_def.ex

Lines changed: 0 additions & 5 deletions
This file was deleted.

lib/elixir/test/elixir/fixtures/consolidation/sample.ex

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ defprotocol Protocol.ConsolidationTest.Sample do
44
@deprecated "Reason"
55
@spec ok(t) :: boolean
66
def ok(term)
7+
8+
# Not a protocol function
9+
Kernel.def(regular_fun(term), do: term + 1)
710
end

lib/elixir/test/elixir/protocol/consolidation_test.exs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Kernel.ParallelCompiler.compile_to_path(files, path, return_diagnostics: true)
88

99
defmodule Protocol.ConsolidationTest do
1010
use ExUnit.Case, async: true
11-
alias Protocol.ConsolidationTest.{Sample, WithAny, NoImpl, ExtraDef}
11+
alias Protocol.ConsolidationTest.{Sample, WithAny, NoImpl}
1212

1313
defimpl WithAny, for: Map do
1414
def ok(map, _opts) do
@@ -65,14 +65,6 @@ defmodule Protocol.ConsolidationTest do
6565

6666
defp no_impl_binary, do: unquote(binary)
6767

68-
# No Any
69-
:code.purge(ExtraDef)
70-
:code.delete(ExtraDef)
71-
{:ok, binary} = Protocol.consolidate(ExtraDef, [])
72-
:code.load_binary(ExtraDef, ~c"protocol_test.exs", binary)
73-
74-
defp extra_def_binary, do: unquote(binary)
75-
7668
test "consolidated?/1" do
7769
assert Protocol.consolidated?(WithAny)
7870
refute Protocol.consolidated?(Enumerable)
@@ -244,12 +236,9 @@ defmodule Protocol.ConsolidationTest do
244236
end
245237

246238
test "handles regular function definitions" do
247-
exports = exports(extra_def_binary())
239+
exports = exports(sample_binary())
248240

249241
assert %{{:regular_fun, 1} => %{sig: :none}} = exports
250-
251-
assert %{{:protocol_fun, 1} => %{sig: {:strong, nil, clauses}}} = exports
252-
assert clauses == [{[none()], dynamic()}]
253242
end
254243
end
255244

0 commit comments

Comments
 (0)