Deprecate quote binding: in favor of quote bind_quoted:

Author: José Valim

CHANGELOG.md

@@ -25,6 +25,7 @@
   * [Enum] Receiving the index of iteration in `Enum.map/2` and `Enum.each/2` is deprecated in favor of `Stream.with_index/1`
   * [File] `File.iterator/1` and `File.biniterator/1` are deprecated in favor of `IO.stream/1` and `IO.binstream/1`
   * [File] `File.iterator!/2` and `File.biniterator!/2` are deprecated in favor of `File.stream!/2` and `File.binstream!/2`
+  * [Kernel] Deprecate recently added `quote binding: ...` in favor of the clearer `quote bind_quoted: ...`
   * [Record] `Record.__index__/2` deprecated in favor of `Record.__record__(:index, key)`
 
 * backwards incompatible changes

lib/elixir/lib/io/ansi.ex

@@ -2,7 +2,7 @@ defmodule IO.ANSI.Sequence do
   @moduledoc false
 
   defmacro defsequence(name, code) do
-    quote binding: [name: name, code: code] do
+    quote bind_quoted: [name: name, code: code] do
       def unquote(name)() do
         "\e[#{unquote(code)}m"
       end

lib/elixir/lib/kernel/special_forms.ex

@@ -689,13 +689,13 @@ defmodule Kernel.SpecialForms do
 
   One solution for this problem is to disable unquoting in the
   macro, however, doing that would make it impossible to inject
-  `kv` representation into the tree. That's when the `:binding`
-  option comes to the rescue. By using `:binding`, we can
+  `kv` representation into the tree. That's when the `:bind_quoted`
+  option comes to the rescue. By using `:bind_quoted`, we can
   automatically disable unquoting while still injecting the
   desired variables into the tree:
 
       defmacro defkv(kv) do
-        quote binding: [kv: kv] do
+        quote bind_quoted: [kv: kv] do
           Enum.each kv, fn { k, v } ->
             def unquote(k)(), do: unquote(v)
           end

lib/elixir/src/elixir_translator.erl

@@ -205,7 +205,7 @@ translate_each({ quote, Meta, [KV, Do] }, S) when is_list(Do) ->
       false -> syntax_error(Meta, S#elixir_scope.file, "invalid args for quote")
     end,
 
-  ValidOpts   = [hygiene, context, var_context, location, line, file, unquote, binding],
+  ValidOpts   = [hygiene, context, var_context, location, line, file, unquote, binding, bind_quoted],
   { TKV, ST } = translate_opts(Meta, quote, ValidOpts, KV, S),
 
   Hygiene = case lists:keyfind(hygiene, 1, TKV) of
@@ -261,8 +261,14 @@ translate_each({ quote, Meta, [KV, Do] }, S) when is_list(Do) ->
   end,
 
   { Binding, DefaultUnquote } = case lists:keyfind(binding, 1, TKV) of
-    { binding, B } when is_list(B) -> { B, false };
-    false -> { nil, true }
+    { binding, B } when is_list(B) ->
+      elixir_errors:deprecation(Meta, S#elixir_scope.file, ":binding in quote is deprecated in favor of :bind_quoted"),
+      { B, false };
+    false ->
+      case lists:keyfind(bind_quoted, 1, TKV) of
+        { bind_quoted, BQ } -> { BQ, false };
+        false -> { nil, true }
+      end
   end,
 
   Unquote = case lists:keyfind(unquote, 1, TKV) of

lib/elixir/test/elixir/kernel/quote_test.exs

@@ -158,8 +158,8 @@ defmodule Kernel.QuoteTest do
     assert quote(dynamic_opts, do: bar(1, 2, 3)) == { :bar, [line: 3], [1, 2, 3] }
   end
 
-  test :binding do
-    assert quote(binding: [foo: 1 + 2], do: foo) == { :__block__, [], [
+  test :bind_quoted do
+    assert quote(bind_quoted: [foo: 1 + 2], do: foo) == { :__block__, [], [
       { :=, [], [{ :foo, [], Kernel.QuoteTest }, 3] },
       { :foo, [], Kernel.QuoteTest }
     ] }

lib/ex_unit/lib/ex_unit/case.ex

@@ -84,7 +84,7 @@ defmodule ExUnit.Case do
     var      = Macro.escape(var)
     contents = Macro.escape(contents, unquote: true)
 
-    quote binding: binding do
+    quote bind_quoted: binding do
       message = if is_binary(message) do
         :"test #{message}"
       else