Preserve compatibility

Author: josevalim

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

@@ -6,9 +6,18 @@ defmodule Mix.Compilers.Protocol do
   ## Umbrella handling
 
   def umbrella(args, res) do
+    config = Mix.Project.config()
+    config_mtime = Mix.Project.config_mtime(config)
     {opts, _, _} = OptionParser.parse(args, switches: [force: :boolean, verbose: :boolean])
+
+    opts =
+      if "--no-protocol-consolidation" in args do
+        Keyword.put(opts, :consolidate_protocols, false)
+      else
+        Keyword.take(config, [:consolidate_protocols]) ++ opts
+      end
+
     manifest = manifest()
-    config_mtime = Mix.Project.config_mtime()
     {old_config_mtime, old_protocols_and_impls} = read_manifest(manifest)
 
     case status(config_mtime > old_config_mtime, opts) do

lib/mix/lib/mix/tasks/archive.build.ex

@@ -63,7 +63,7 @@ defmodule Mix.Tasks.Archive.Build do
     if project && Keyword.get(opts, :compile, true) do
       # We only care about the archive ebin, so we disable protocol
       # consolidation to avoid further changes to the environment.
-      Mix.Task.run(:compile, ["--no-consolidate-protocols" | args])
+      Mix.Task.run(:compile, ["--no-protocol-consolidation" | args])
     end
 
     source =

lib/mix/lib/mix/tasks/compile.elixir.ex

@@ -90,7 +90,6 @@ defmodule Mix.Tasks.Compile.Elixir do
   @switches [
     force: :boolean,
     docs: :boolean,
-    consolidate_protocols: :boolean,
     warnings_as_errors: :boolean,
     ignore_module_conflict: :boolean,
     debug_info: :boolean,
@@ -125,6 +124,13 @@ defmodule Mix.Tasks.Compile.Elixir do
       |> tracers_opts(tracers)
       |> profile_opts()
 
+    opts =
+      if "--no-protocol-consolidation" in args do
+        Keyword.put(opts, :consolidate_protocols, false)
+      else
+        opts
+      end
+
     # Having compilations racing with other is most undesired,
     # so we wrap the compiler in a lock.
 

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

@@ -71,7 +71,7 @@ defmodule Mix.Tasks.Compile do
       default case with dependencies)
     * `--no-prune-code-paths` - do not prune code paths before compilation, this keeps
       the entirety of Erlang/OTP available when the project starts
-    * `--no-consolidate-protocols` - skips protocol consolidation
+    * `--no-protocol-consolidation` - skips protocol consolidation
     * `--no-validate-compile-env` - does not validate the application compile environment
     * `--return-errors` - returns error status and diagnostics instead of exiting on error
     * `--warnings-as-errors` - exit with non-zero status if compilation has one or more

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

@@ -224,10 +224,10 @@ defmodule Mix.Tasks.CompileTest do
     end)
   end
 
-  test "skip protocol consolidation when --no-consolidate-protocols" do
+  test "skip protocol consolidation when --no-protocol-consolidation" do
     in_fixture("no_mixfile", fn ->
       File.rm("_build/dev/lib/sample/.mix/compile.protocols")
-      assert Mix.Task.run("compile", ["--no-consolidate-protocols"]) == {:ok, []}
+      assert Mix.Task.run("compile", ["--no-protocol-consolidation"]) == {:ok, []}
       assert File.regular?("_build/dev/lib/sample/ebin/Elixir.A.beam")
       refute File.regular?("_build/dev/lib/sample/consolidated/Elixir.Enumerable.beam")
     end)
@@ -283,7 +283,7 @@ defmodule Mix.Tasks.CompileTest do
     Mix.Project.push(WrongPath)
 
     ExUnit.CaptureIO.capture_io(fn ->
-      assert Mix.Task.run("compile", ["--no-consolidate-protocols"]) == {:noop, []}
+      assert Mix.Task.run("compile", ["--no-protocol-consolidation"]) == {:noop, []}
     end)
   end