Remove deprecated code

Author: José Valim

CHANGELOG.md

@@ -13,7 +13,7 @@
 * Enhancements
   * [EEx] Allow `EEx.AssignsEngine` to accept any Dict
   * [Enum] Add `Enum.flat_map_reduce/3`
-  * [ExUnit] Support @moduletag in ExUnit cases
+  * [ExUnit] Support `@moduletag` in ExUnit cases
   * [Kernel] Improve stacktraces to be relative to the compilation path and include the related application
   * [Stream] Add `Stream.transform/3`
 

lib/elixir/lib/enum.ex

@@ -741,20 +741,6 @@ defmodule Enum do
     end
   end
 
-  @doc false
-  @spec first(t) :: :nil | element
-  def first(list) when is_list(list) do
-    IO.write "Enum.first/1 is deprecated, please use Enum.at/2 or List.first/1 instead\n#{Exception.format_stacktrace}"
-    List.first(list)
-  end
-
-  def first(collection) do
-    IO.write "Enum.first/1 is deprecated, please use Enum.at/2 instead\n#{Exception.format_stacktrace}"
-    Enumerable.reduce(collection, { :cont, nil }, fn(entry, _) ->
-      { :halt, entry }
-    end) |> elem(1)
-  end
-
   @doc """
   Returns a new collection appending the result of invoking `fun`
   on each corresponding item of `collection`.

lib/elixir/lib/kernel.ex

@@ -506,13 +506,6 @@ defmodule Kernel do
     :erlang.iolist_to_binary(item)
   end
 
-  @doc false
-  @spec is_alive :: boolean
-  def is_alive do
-    IO.write "is_alive/0 is deprecated, please use Node.alive?/0 instead\n#{Exception.format_stacktrace}"
-    :erlang.is_alive
-  end
-
   @doc """
   Returns `true` if `term` is an atom; otherwise returns `false`.
 
@@ -1136,12 +1129,6 @@ defmodule Kernel do
     quote do: __op__(:/, unquote(left), unquote(right))
   end
 
-  @doc false
-  def pid <- msg do
-    IO.write "<-/2 is deprecated, please use send/2 instead\n#{Exception.format_stacktrace}"
-    :erlang.!(pid, msg)
-  end
-
   @doc """
   Concatenates two lists. Allowed in guard clauses.
 
@@ -1774,22 +1761,7 @@ defmodule Kernel do
 
   """
   @spec inspect(Inspect.t, Keyword.t) :: String.t
-  def inspect(arg, opts // [])
-
-  def inspect(arg, opts) when is_tuple(opts) and tuple_size(opts) > 0 and elem(opts, 0) == Inspect.Opts do
-    IO.write "Kernel.inspect/2 with Inspect.Opts is deprecated, please use Inspect.Algebra.to_doc/2 instead\n#{Exception.format_stacktrace}"
-    Inspect.Algebra.to_doc(arg, opts)
-  end
-
-  def inspect(arg, opts) when is_list(opts) do
-    case Keyword.get(opts, :raw) do
-      nil ->
-        :ok
-      raw ->
-        IO.write "Kernel.inspect/2 with :raw option is deprecated, please use :records instead\n#{Exception.format_stacktrace}"
-        opts = opts ++ [records: not raw]
-    end
-
+  def inspect(arg, opts // []) when is_list(opts) do
     opts  = Inspect.Opts.new(opts)
     limit = case opts.pretty do
       true  -> opts.width

lib/elixir/lib/macro.ex

@@ -641,12 +641,6 @@ defmodule Macro do
     do: { env.module, true }
   defp do_expand_once({ :__DIR__, _, atom }, env)    when is_atom(atom),
     do: { :filename.dirname(env.file), true }
-
-  defp do_expand_once({ :__FILE__, _, atom }, env) when is_atom(atom) do
-    IO.write "__FILE__ is deprecated, please use __DIR__ or __ENV__.file instead\n#{Exception.format_stacktrace}"
-    { env.file, true }
-  end
-
   defp do_expand_once({ :__ENV__, _, atom }, env)    when is_atom(atom),
     do: { { :{}, [], tuple_to_list(env) }, true }
   defp do_expand_once({ { :., _, [{ :__ENV__, _, atom }, field] }, _, [] } = original, env) when

lib/elixir/src/elixir_exp.erl

@@ -122,9 +122,6 @@ expand({ import, Meta, [Ref, KV] }, E) ->
 
 expand({ '__MODULE__', _, Atom }, E) when is_atom(Atom) ->
   { E#elixir_env.module, E };
-expand({ '__FILE__', Meta, Atom }, E) when is_atom(Atom) ->
-  elixir_errors:deprecation(Meta, E#elixir_env.file, "__FILE__ is deprecated, please use __DIR__ or __ENV__.file instead"),
-  { E#elixir_env.file, E };
 expand({ '__DIR__', _, Atom }, E) when is_atom(Atom) ->
   { filename:dirname(E#elixir_env.file), E };
 expand({ '__CALLER__', _, Atom } = Caller, E) when is_atom(Atom) ->

lib/elixir/src/elixir_tokenizer.erl

@@ -141,11 +141,11 @@ tokenize([$#|String], Line, Scope, Tokens) ->
 
 tokenize([$%,S,H,H,H|T] = Original, Line, Scope, Tokens) when ?is_quote(H), ?is_upcase(S) orelse ?is_downcase(S) ->
   case extract_heredoc_with_interpolation(Line, Scope, ?is_downcase(S), T, H) of
-    { error, Reason } ->
-      { error, Reason, Original, Tokens };
-    { Parts, Rest } ->
+    { ok, NewLine, Parts, Rest } ->
       { Final, Modifiers } = collect_modifiers(Rest, []),
-      tokenize(Final, Line, Scope, [{ sigil, Line, S, Parts, Modifiers }|Tokens])
+      tokenize(Final, NewLine, Scope, [{ sigil, Line, S, Parts, Modifiers }|Tokens]);
+    { error, Reason } ->
+      { error, Reason, Original, Tokens }
   end;
 
 tokenize([$%,S,H|T] = Original, Line, Scope, Tokens) when not(?is_identifier(H)), not(?is_terminator(H)), ?is_upcase(S) orelse ?is_downcase(S) ->
@@ -482,11 +482,6 @@ tokenize([Space, Sign, NotMarker|T], Line, Scope, [{ Identifier, _, _ } = H|Toke
 
 tokenize([T|Rest], Line, Scope, Tokens) when ?is_horizontal_space(T) ->
   tokenize(Rest, Line, Scope, Tokens);
-
-%% TODO: This token is deprecated once continuable heredocs are removed
-tokenize([{line,Line}|Rest], _Line, Scope, Tokens) ->
-  tokenize(Rest, Line, Scope, Tokens);
-
 tokenize(T, Line, _Scope, Tokens) ->
   { error, { Line, "invalid token: ", until_eol(T) }, T, Tokens }.
 
@@ -503,11 +498,11 @@ escape_char(List) ->
 
 handle_heredocs(T, Line, H, Scope, Tokens) ->
   case extract_heredoc_with_interpolation(Line, Scope, true, T, H) of
-    { error, Reason } ->
-      { error, Reason, [H, H, H] ++ T, Tokens };
-    { Parts, Rest } ->
+    { ok, NewLine, Parts, Rest } ->
       Token = { string_type(H), Line, unescape_tokens(Parts) },
-      tokenize(Rest, Line, Scope, [Token|Tokens])
+      tokenize(Rest, NewLine, Scope, [Token|Tokens]);
+    { error, Reason } ->
+      { error, Reason, [H, H, H] ++ T, Tokens }
   end.
 
 handle_strings(T, Line, H, Scope, Tokens) ->
@@ -575,34 +570,33 @@ collect_modifiers(Rest, Buffer) ->
 %% Heredocs
 
 extract_heredoc_with_interpolation(Line, Scope, Interpol, T, H) ->
-  case extract_heredoc(Line, T, H, Scope) of
-    { error, _ } = Error ->
-      Error;
-    { Body, Rest } ->
+  case extract_heredoc(Line, T, H) of
+    { ok, NewLine, Body, Rest } ->
       case elixir_interpolation:extract(Line + 1, Scope, Interpol, Body, 0) of
         { error, Reason } ->
           { error, interpolation_format(Reason, " (for heredoc starting at line ~B)", [Line]) };
         { _, Parts, [] } ->
-          { Parts, Rest }
-      end
+          { ok, NewLine, Parts, Rest }
+      end;
+    { error, _ } = Error ->
+      Error
   end.
 
-extract_heredoc(Line0, Rest0, Marker, Scope) ->
-  case extract_heredoc_header(Rest0, [], {Line0,Scope#elixir_tokenizer.file}) of
-    { ok, Extra, Rest1 } ->
+extract_heredoc(Line0, Rest0, Marker) ->
+  case extract_heredoc_header(Rest0) of
+    { ok, Rest1 } ->
       %% We prepend a new line so we can transparently remove
       %% spaces later. This new line is removed by calling `tl`
       %% in the final heredoc body three lines below.
       case extract_heredoc_body(Line0, Marker, [$\n|Rest1], []) of
-        { Line1, Body, Rest2, Spaces } ->
-          { tl(remove_heredoc_spaces(Body, Spaces)), merge_heredoc_extra(Line1, Extra, Rest2) };
+        { ok, Line1, Body, Rest2, Spaces } ->
+          { ok, Line1, tl(remove_heredoc_spaces(Body, Spaces)), Rest2 };
         { error, ErrorLine } ->
           Terminator = [Marker, Marker, Marker],
           Message = "missing terminator: ~ts (for heredoc starting at line ~B)",
           { error, { ErrorLine, io_lib:format(Message, [Terminator, Line0]), [] } }
       end;
     error ->
-      %% TODO: Test me once the deprecated continuable heredocs are removed
       Terminator = [Marker, Marker, Marker],
       Message = "heredoc start ~ts must be followed by a new line",
       { error, { Line0, io_lib:format(Message, [Terminator]), [] } }
@@ -625,32 +619,25 @@ remove_heredoc_spaces([], Buffer, _Spaces, _Original) ->
 
 %% Extract the heredoc header.
 
-extract_heredoc_header("\r\n" ++ Rest, Buffer, _Scope) ->
-  { ok, Buffer, Rest };
-extract_heredoc_header("\n" ++ Rest, Buffer, _Scope) ->
-  { ok, Buffer, Rest };
-extract_heredoc_header([H|T], Buffer, {Line,File}) when not ?is_horizontal_space(H) ->
-  elixir_errors:deprecation([{line,Line}], File, "continuable heredocs are deprecated, parsing will no longer continue on the same line as the heredoc starts"),
-  extract_heredoc_header(T, [H|Buffer], nil);
-extract_heredoc_header([H|T], Buffer, _Scope) ->
-  extract_heredoc_header(T, [H|Buffer], _Scope);
-extract_heredoc_header(_, _, _Scope) ->
+extract_heredoc_header("\r\n" ++ Rest) ->
+  { ok, Rest };
+extract_heredoc_header("\n" ++ Rest) ->
+  { ok, Rest };
+extract_heredoc_header([_|T]) ->
+  extract_heredoc_header(T);
+extract_heredoc_header(_) ->
   error.
 
 %% Extract heredoc body. It returns the heredoc body (in reverse order),
 %% the remaining of the document and the number of spaces the heredoc
 %% is aligned.
 
-%% TODO: This token is deprecated once continuable heredocs are removed
-extract_heredoc_body(_Line, Marker, [{line,NewLine}|Rest], Buffer) ->
-  extract_heredoc_body(NewLine, Marker, Rest, Buffer);
-
 extract_heredoc_body(Line, Marker, Rest, Buffer) ->
   case extract_heredoc_line(Marker, Rest, Buffer, 0) of
     { ok, NewBuffer, NewRest } ->
       extract_heredoc_body(Line + 1, Marker, NewRest, NewBuffer);
     { ok, NewBuffer, NewRest, Spaces } ->
-      { Line, NewBuffer, NewRest, Spaces };
+      { ok, Line, NewBuffer, NewRest, Spaces };
     { error, eof } ->
       { error, Line }
   end.
@@ -675,17 +662,6 @@ extract_heredoc_line(Marker, [Marker,Marker,Marker|T], Buffer, Counter) ->
 extract_heredoc_line(_Marker, Rest, Buffer, _Counter) ->
   extract_heredoc_line(Rest, Buffer).
 
-%% Merge heredoc extra by replying it on the buffer. It also adds
-%% a special { line, Line } token to force a line change along the way.
-
-%% TODO: This token is deprecated once continuable heredocs are removed
-merge_heredoc_extra(Line, Extra, Buffer) ->
-  merge_heredoc_extra(Extra, [{line,Line}|Buffer]).
-merge_heredoc_extra([H|T], Buffer) ->
-  merge_heredoc_extra(T, [H|Buffer]);
-merge_heredoc_extra([], Buffer) ->
-  Buffer.
-
 %% Integers and floats
 %% At this point, we are at least sure the first digit is a number.
 

lib/elixir/test/elixir/kernel/errors_test.exs

@@ -49,6 +49,12 @@ defmodule Kernel.ErrorsTest do
       '"bar'
   end
 
+  test :heredoc_start do
+    assert_compile_fail TokenMissingError,
+      "nofile:1: heredoc start \"\"\" must be followed by a new line",
+      '"""bar'
+  end
+
   test :heredoc_terminator do
     assert_compile_fail TokenMissingError,
       "nofile:2: missing terminator: \"\"\" (for heredoc starting at line 1)",