Fixes

Author: josevalim

lib/iex/lib/iex/helpers.ex

@@ -171,7 +171,6 @@ defmodule IEx.Helpers do
   defp reenable_tasks(config) do
     Mix.Task.reenable("compile")
     Mix.Task.reenable("compile.all")
-    Mix.Task.reenable("compile.protocols")
     compilers = config[:compilers] || Mix.compilers()
     Enum.each(compilers, &Mix.Task.reenable("compile.#{&1}"))
   end

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

@@ -284,7 +284,7 @@ defmodule Mix.Compilers.Elixir do
     rescue
       _ -> {[], []}
     else
-      {@manifest_vsn, modules, sources, _, _, _, _, _, _} -> {modules, sources}
+      {@manifest_vsn, modules, sources, _, _, _, _, _, _, _} -> {modules, sources}
       _ -> {[], []}
     end
   end
@@ -293,8 +293,8 @@ defmodule Mix.Compilers.Elixir do
   Retrieves all diagnostics from the given manifest.
   """
   def diagnostics(manifest, dest) do
-    {_, all_sources, _, _, _, _, _, _, _} = parse_manifest(manifest, dest)
-    previous_warnings(all_sources, false)
+    {_, sources} = read_manifest(manifest, dest)
+    previous_warnings(sources, false)
   end
 
   defp compiler_info_from_force(manifest, all_paths, all_modules, dest) do
@@ -638,7 +638,10 @@ defmodule Mix.Compilers.Elixir do
         modules = modules |> Map.merge(dep_modules) |> Map.merge(removed)
         exports = Map.merge(exports, removed)
         deps_exports = Map.put(deps_exports, app, new_exports)
-        protocols_and_impls = protocols_and_impls_from_modules(modules, protocols_and_impls)
+
+        protocols_and_impls =
+          protocols_and_impls_from_modules(manifest_modules, protocols_and_impls)
+
         {modules, exports, deps_exports, protocols_and_impls}
     end
   end
@@ -1153,7 +1156,7 @@ defmodule Mix.Compilers.Elixir do
           {Map.replace!(acc_sources, file, source(size: size, digest: digest)), acc_modules}
         end)
 
-      state = {modules, exports, sources, [], pending_modules, removed_modules}
+      state = {modules, exports, sources, [], pending_modules, removed_modules, consolidate}
       {{:compile, changed, []}, state}
     end
   end

lib/mix/lib/mix/compilers/protocol.ex

@@ -86,21 +86,23 @@ defmodule Mix.Compilers.Protocol do
 
   def compile(force?, old_protocols_and_impls, protocols_and_impls, opts) do
     output = Mix.Project.consolidation_path()
-    File.mkdir_p!(output)
-    Code.prepend_path(output)
 
-    if opts[:force] || force? do
-      clean_consolidated()
-      paths = consolidation_paths()
-
-      paths
-      |> Protocol.extract_protocols()
-      |> consolidate(paths, output, opts)
-    else
-      protocols_and_impls
-      |> diff_manifest(old_protocols_and_impls, output)
-      |> consolidate(consolidation_paths(), output, opts)
-    end
+    res =
+      if opts[:force] || force? do
+        clean_consolidated()
+        paths = consolidation_paths()
+
+        paths
+        |> Protocol.extract_protocols()
+        |> consolidate(paths, output, opts)
+      else
+        protocols_and_impls
+        |> diff_manifest(old_protocols_and_impls, output)
+        |> consolidate(consolidation_paths(), output, opts)
+      end
+
+    Code.prepend_path(output)
+    res
   end
 
   defp clean_consolidated do
@@ -115,11 +117,15 @@ defmodule Mix.Compilers.Protocol do
     Enum.filter(paths, &(not :lists.prefix(otp, &1)))
   end
 
-  defp consolidate([], _paths, _output, _opts) do
+  defp consolidate([], _paths, output, _opts) do
+    File.mkdir_p!(output)
+
     :noop
   end
 
   defp consolidate(protocols, paths, output, opts) do
+    File.mkdir_p!(output)
+
     protocols
     |> Enum.uniq()
     |> Enum.map(&Task.async(fn -> consolidate_each(&1, paths, output, opts) end))

lib/mix/test/mix/tasks/compile_test.exs

@@ -29,7 +29,7 @@ defmodule Mix.Tasks.CompileTest do
     msg = "\nEnabled compilers: yecc, leex, erlang, elixir, app, protocols"
     assert_received {:mix_shell, :info, [^msg]}
 
-    assert_received {:mix_shell, :info, ["mix compile.elixir    # " <> _]}
+    assert_received {:mix_shell, :info, ["mix compile.elixir # " <> _]}
   end
 
   @tag project: [compilers: [:elixir, :app, :custom]]