Deprecate usage of @behavior in favor of @behaviour

Author: José Valim

CHANGELOG.md

@@ -16,6 +16,7 @@
 * Deprecations
   * [Kernel] `binary_to_term/1`, `binary_to_term/2`, `term_to_binary/1` and `term_to_binary/2` are deprecated in favor of their counterparts in the `:erlang` module
   * [Kernel] `//` for default arguments is deprecated in favor of `\\`. This is a soft deprecation, no warnings will be emitted for it in this release
+  * [Kernel] Deprecate `@behavior` in favor of `@behaviour`
   * [Record] Deprecate `to_keywords`, `getter` and `list getter` functionalities in `defrecordp`
 
 * Backwards incompatible changes
@@ -45,7 +46,7 @@
 
 * Deprecations
   * [Enum] Deprecate `Enum.first/1` in favor of `Enum.at/2` and `List.first/1`
-  * [Kernel] Deprecate continuable heredocs. In previous versions, Elixir would continue parsing on the same line the heredoc started, this behavior has been deprecated
+  * [Kernel] Deprecate continuable heredocs. In previous versions, Elixir would continue parsing on the same line the heredoc started, this behaviour has been deprecated
   * [Kernel] `is_alive/0` is deprecated in favor of `Node.alive?`
   * [Kernel] `Kernel.inspect/2` with `Inspect.Opts[]` is deprecated in favor of `Inspect.Algebra.to_doc/2`
   * [Kernel] `Kernel.inspect/2` with `:raw` option is deprecated, use `:records` option instead
@@ -745,7 +746,7 @@
 * Backwards incompatible changes
   * [Kernel] Compile files now follow `Elixir-ModuleName` convention to solve issues with Erlang embedded mode. This removes the `__MAIN__` pseudo-variable as modules are now located inside `Elixir` namespace
   * [Kernel] `__using__` callback triggered by `use` now receives just one argument. Caller information can be accessed via macros using `__CALLER__`
-  * [Kernel] Comprehensions syntax changed to be more compatible with Erlang behavior
+  * [Kernel] Comprehensions syntax changed to be more compatible with Erlang behaviour
   * [Kernel] loop and recur are removed in favor of recursion with named functions
   * [Module] Removed data functions in favor of unifying the attributes API
 

lib/eex/lib/eex/smart_engine.ex

@@ -2,7 +2,7 @@ defmodule EEx.TransformerEngine do
   @moduledoc """
   An abstract engine that is meant to be used and
   built upon in other modules. This engine implements
-  the `EEx.Engine` behavior and provides a `transform`
+  the `EEx.Engine` behaviour and provides a `transform`
   overridable directive that allows a developer to
   customize the expression returned by the engine.
 
@@ -13,7 +13,7 @@ defmodule EEx.TransformerEngine do
   @doc false
   defmacro __using__(_) do
     quote do
-      @behavior EEx.Engine
+      @behaviour EEx.Engine
 
       def handle_text(buffer, text) do
         EEx.Engine.handle_text(buffer, text)

lib/elixir/lib/application/behaviour.ex

@@ -92,7 +92,7 @@ defmodule Application.Behaviour do
   @doc false
   defmacro __using__(_) do
     quote location: :keep do
-      @behavior :application
+      @behaviour :application
 
       @doc false
       def stop(_state) do

lib/elixir/lib/code.ex

@@ -10,7 +10,7 @@ defmodule Code do
   Utilities for managing code compilation, code evaluation and code loading.
 
   This module complements [Erlang's code module](http://www.erlang.org/doc/man/code.html)
-  to add behavior which is specific to Elixir.
+  to add behaviour which is specific to Elixir.
   """
 
   @doc """

lib/elixir/lib/gen_fsm/behaviour.ex

@@ -166,7 +166,7 @@ defmodule GenFSM.Behaviour do
   @doc false
   defmacro __using__(_) do
     quote location: :keep do
-      @behavior :gen_fsm
+      @behaviour :gen_fsm
 
       @doc false
       def handle_event(event, state_name, state_data) do

lib/elixir/lib/gen_server/behaviour.ex

@@ -86,7 +86,7 @@ defmodule GenServer.Behaviour do
   @doc false
   defmacro __using__(_) do
     quote location: :keep do
-      @behavior :gen_server
+      @behaviour :gen_server
 
       @doc false
       def init(args) do

lib/elixir/lib/kernel.ex

@@ -238,13 +238,13 @@ defmodule Kernel do
 
   @doc false
   def binary_to_term(binary) do
-    IO.write "binary_to_term/1 is deprecated, please use :erlang.binary_to_term/1 instead\n#{Exception.format_stacktrace}"
+    IO.write :stderr, "binary_to_term/1 is deprecated, please use :erlang.binary_to_term/1 instead\n#{Exception.format_stacktrace}"
     :erlang.binary_to_term(binary)
   end
 
   @doc false
   def binary_to_term(binary, options) do
-    IO.write "binary_to_term/2 is deprecated, please use :erlang.binary_to_term/2 instead\n#{Exception.format_stacktrace}"
+    IO.write :stderr, "binary_to_term/2 is deprecated, please use :erlang.binary_to_term/2 instead\n#{Exception.format_stacktrace}"
     :erlang.binary_to_term(binary, options)
   end
 
@@ -1037,13 +1037,13 @@ defmodule Kernel do
 
   @doc false
   def term_to_binary(term) do
-    IO.write "term_to_binary/1 is deprecated, please use :erlang.term_to_binary/1 instead\n#{Exception.format_stacktrace}"
+    IO.write :stderr, "term_to_binary/1 is deprecated, please use :erlang.term_to_binary/1 instead\n#{Exception.format_stacktrace}"
     :erlang.term_to_binary(term)
   end
 
   @doc false
   def term_to_binary(term, opts) do
-    IO.write "term_to_binary/2 is deprecated, please use :erlang.term_to_binary/2 instead\n#{Exception.format_stacktrace}"
+    IO.write :stderr, "term_to_binary/2 is deprecated, please use :erlang.term_to_binary/2 instead\n#{Exception.format_stacktrace}"
     :erlang.term_to_binary(term, opts)
   end
 
@@ -1991,10 +1991,10 @@ defmodule Kernel do
   This macro is a shortcut to read and add attributes to the module
   being compiled. Elixir module attributes are similar to Erlang's with
   some differences. The canonical example for attributes is annotating
-  that a module implements the OTP behavior called `gen_server`:
+  that a module implements the OTP behaviour called `gen_server`:
 
       defmodule MyServer do
-        @behavior :gen_server
+        @behaviour :gen_server
         # ... callbacks ...
       end
 
@@ -2056,22 +2056,22 @@ defmodule Kernel do
   end
 
   # @attribute value
-  defp do_at([arg], name, function?, _env) do
+  defp do_at([arg], name, function?, env) do
     case function? do
       true ->
         raise ArgumentError, message: "cannot dynamically set attribute @#{name} inside function"
       false ->
+        if name == :behavior do
+          IO.write :stderr, "warning: @behavior attribute is not supported, please use @behaviour instead\n" <>
+                            Exception.format_stacktrace(env_stacktrace(env))
+        end
         quote do: Module.put_attribute(__MODULE__, unquote(name), unquote(arg))
     end
   end
 
   # @attribute or @attribute()
   defp do_at(args, name, function?, env) when is_atom(args) or args == [] do
-    stack =
-      case bootstraped?(Path) do
-        true  -> env.stacktrace
-        false -> []
-      end
+    stack = env_stacktrace(env)
 
     case function? do
       true ->
@@ -3833,6 +3833,13 @@ defmodule Kernel do
   defp env_context(env),  do: :erlang.element(6, env)
   defp env_vars(env),     do: :erlang.element(13, env)
 
+  defp env_stacktrace(env) do
+    case bootstraped?(Path) do
+      true  -> env.stacktrace
+      false -> []
+    end
+  end
+
   defp expand_compact([{ :compact, false }|t]), do: expand_compact(t)
   defp expand_compact([{ :compact, true }|t]),  do: [:compact|expand_compact(t)]
   defp expand_compact([h|t]),                   do: [h|expand_compact(t)]

lib/elixir/lib/kernel/record_rewriter.ex

@@ -72,7 +72,7 @@ defmodule Kernel.RecordRewriter do
     case record_fields(module, record) do
       { fields, optimizable } ->
         opt_call =
-          if :lists.member({ function, length(args) + 1 }, optimizable) do
+          if { function, length(args) + 1 } in optimizable do
             case record_field_info(function) do
               { kind, field } ->
                 if index = Enum.find_index(fields, &(field == &1)) do

lib/elixir/lib/kernel/special_forms.ex

@@ -331,7 +331,7 @@ defmodule Kernel.SpecialForms do
   Elixir won't emit any warnings though, since the alias
   was not explicitly defined.
 
-  Both warning behaviors could be changed by explicitily
+  Both warning behaviours could be changed by explicitily
   setting the `:warn` option to true or false.
   """
   defmacro alias(module, opts)
@@ -443,7 +443,7 @@ defmodule Kernel.SpecialForms do
   Elixir won't emit any warnings though, since the import
   was not explicitly defined.
 
-  Both warning behaviors could be changed by explicitily
+  Both warning behaviours could be changed by explicitily
   setting the `:warn` option to true or false.
 
   ## Ambiguous function/macro names

lib/elixir/lib/macro.ex

@@ -182,10 +182,9 @@ defmodule Macro do
   @doc %S"""
   Unescape the given chars.
 
-  This is the unescaping behavior
-  used by default in Elixir single- and double-quoted strings.
-  Check `unescape_string/2` for information on how to customize
-  the escaping map.
+  This is the unescaping behaviour used by default in Elixir
+  single- and double-quoted strings. Check `unescape_string/2`
+  for information on how to customize the escaping map.
 
   In this setup, Elixir will escape the following: `\a`, `\b`,
   `\d`, `\e`, `\f`, `\n`, `\r`, `\s`, `\t` and `\v`. Octals are