Skip to content

Commit 8cc702d

Browse files
committed
Simplify manifest reading in Mix.Compilers.Test
1 parent de9eefb commit 8cc702d

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

lib/mix/lib/mix/compilers/elixir.ex

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,11 @@ defmodule Mix.Compilers.Elixir do
118118
Reads the manifest.
119119
"""
120120
def read_manifest(manifest, compile_path) do
121-
# TODO: No longer support file consult once v1.3 is out
122121
try do
123122
manifest |> File.read!() |> :erlang.binary_to_term()
124123
else
125-
[@manifest_vsn | t] ->
126-
expand_beam_paths(t, compile_path)
124+
[@manifest_vsn | data] ->
125+
expand_beam_paths(data, compile_path)
127126
_ ->
128127
[]
129128
rescue

lib/mix/lib/mix/compilers/test.ex

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,9 @@ defmodule Mix.Compilers.Test do
160160

161161
defp read_manifest() do
162162
try do
163-
manifest() |> File.read!() |> :erlang.binary_to_term()
164-
else
165-
[@manifest_vsn | t] -> t
166-
_ -> []
163+
[@manifest_vsn | sources] =
164+
manifest() |> File.read!() |> :erlang.binary_to_term()
165+
sources
167166
rescue
168167
_ -> []
169168
end

lib/mix/lib/mix/tasks/compile.protocols.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ defmodule Mix.Tasks.Compile.Protocols do
134134

135135
defp read_manifest(manifest, output) do
136136
try do
137-
[@manifest_vsn | t] =
137+
[@manifest_vsn | metadata] =
138138
manifest |> File.read! |> :erlang.binary_to_term()
139-
t
139+
metadata
140140
rescue
141141
_ ->
142142
# If there is no manifest or it is out of date, remove old files

0 commit comments

Comments
 (0)