Deprecate --no-protocol-consolidation

Author: josevalim

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

@@ -5,15 +5,18 @@ defmodule Mix.Compilers.Protocol do
 
   ## Umbrella handling
 
+  @switches [force: :boolean, verbose: :boolean, consolidate_protocols: :boolean]
+
   def umbrella(args, res) do
     config = Mix.Project.config()
-    {opts, _, _} = OptionParser.parse(args, switches: [force: :boolean, verbose: :boolean])
+    {opts, _, _} = OptionParser.parse(args, switches: @switches)
 
     opts =
       if "--no-protocol-consolidation" in args do
+        # TODO: Deprecate me on Elixir v1.23
         Keyword.put(opts, :consolidate_protocols, false)
       else
-        Keyword.take(config, [:consolidate_protocols]) ++ opts
+        opts ++ Keyword.take(config, [:consolidate_protocols])
       end
 
     manifest = manifest()

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-protocol-consolidation" | args])
+      Mix.Task.run(:compile, ["--no-consolidate-protocols" | args])
     end
 
     source =

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

@@ -90,6 +90,7 @@ 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,
@@ -126,6 +127,7 @@ defmodule Mix.Tasks.Compile.Elixir do
 
     opts =
       if "--no-protocol-consolidation" in args do
+        # TODO: Deprecate me on Elixir v1.23
         Keyword.put(opts, :consolidate_protocols, false)
       else
         opts

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

@@ -2,7 +2,7 @@ defmodule Mix.Tasks.Compile.Protocols do
   @moduledoc false
   use Mix.Task
 
-  # TODO: Warn on Elixir v1.23
+  # TODO: Deprecate me on Elixir v1.23
   def run(_args) do
     :noop
   end

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-protocol-consolidation" do
+  test "skip protocol consolidation when --no-consolidate-protocols" do
     in_fixture("no_mixfile", fn ->
       File.rm("_build/dev/lib/sample/.mix/compile.protocols")
-      assert Mix.Task.run("compile", ["--no-protocol-consolidation"]) == {:ok, []}
+      assert Mix.Task.run("compile", ["--no-consolidate-protocols"]) == {: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-protocol-consolidation"]) == {:noop, []}
+      assert Mix.Task.run("compile", ["--no-consolidate-protocols"]) == {:noop, []}
     end)
   end