Do not support inline types with defrecord

Author: José Valim

lib/elixir/lib/kernel.ex

@@ -1476,11 +1476,11 @@ defmodule Kernel do
   ## Types
 
   Every record defines a type named `t` that can be accessed in typespecs.
-  Those types can be specified when the record is defined:
+  Those types can be specified inside the record definition:
 
-      defrecord User,
-        name: "" :: string,
-        age: 0 :: integer
+      defrecord User do
+        record_type name: string, age: integer
+      end
 
   All fields without a specified type are assumed to have type `term`.
 
@@ -1489,22 +1489,6 @@ defmodule Kernel do
 
       @spec handle_user(User.t) :: boolean()
 
-  If the developer wants to define their own types to be used with the
-  record, Elixir allows a more lengthy definition with the help of the
-  `record_type` macro:
-
-      defrecord Config, counter: 0, failures: [] do
-        @type kind :: term
-        record_type counter: integer, failures: [kind]
-      end
-
-
-  This macro defines a module that generates accessors to manipulate the record
-  at both compilation and runtime.
-
-  See the `Record` module's documentation for a detailed description of records
-  in Elixir.
-
   ## Runtime introspection
 
   At runtime, developers can use `__record__` to get information

lib/elixir/lib/record.ex

@@ -221,9 +221,9 @@ defmodule Record do
   end
 
   @doc false
-  def defrecord(name, values, opts) do
+  def defrecord(name, fields, opts) do
     block = Keyword.get(opts, :do, nil)
-    { fields, types } = record_split(values)
+    record_check!(fields)
 
     quote do
       unquoted_fields = unquote(fields)
@@ -232,7 +232,7 @@ defmodule Record do
         import Elixir.Record.DSL
 
         @record_fields []
-        @record_types  unquote(types)
+        @record_types  []
 
         Elixir.Record.deffunctions(unquoted_fields, __ENV__)
         value = unquote(block)
@@ -242,25 +242,13 @@ defmodule Record do
     end
   end
 
-  defp record_split(fields) when is_list(fields) do
-    record_split(fields, [], [])
+  defp record_check!([{ field, { :::, _, [_, _] }}|_]) when is_atom(field) do
+    raise ArgumentError, message: "typespecs are not supported inlined with defrecord, " <>
+                                  "please use record_type instead"
   end
 
-  defp record_split(other) do
-    { other, [] }
-  end
-
-  defp record_split([{ field, { :::, _, [default, type] }}|t], defaults, types) do
-    record_split t, [{ field, default }|defaults], [{ field, Macro.escape(type) }|types]
-  end
-
-  defp record_split([other|t], defaults, types) do
-    record_split t, [other|defaults], types
-  end
-
-  defp record_split([], defaults, types) do
-    { :lists.reverse(defaults), types }
-  end
+  defp record_check!([_|t]), do: record_check!(t)
+  defp record_check!(_), do: :ok
 
   @doc false
   def defrecordp(name, tag, fields) when is_atom(name) and is_atom(tag) and is_list(fields) do

lib/elixir/test/elixir/record_test.exs

@@ -47,8 +47,6 @@ defrecord RecordTest.WithRecordType, a: 0, b: 1 do
   record_type a: integer
 end
 
-defrecord RecordTest.WithInlineType, a: nil :: atom, b: 1 :: integer
-
 defmodule RecordTest.Macros do
   defmacro gen do
     quote do

lib/elixir/test/elixir/typespec_test.exs

@@ -18,25 +18,25 @@ defmodule Typespec.TypeTest do
   end
 
   test "invalid type specification" do
-    assert_raise ArgumentError, "invalid type specification mytype = 1", fn ->
+    assert_raise CompileError, %r"invalid type specification mytype = 1", fn ->
       test_module do
         @type mytype = 1
       end
     end
-    assert_raise ArgumentError, "invalid type specification mytype = 1", fn ->
+    assert_raise CompileError, %r"invalid type specification mytype = 1", fn ->
       test_module do
         @typep mytype = 1
       end
     end
-    assert_raise ArgumentError, "invalid type specification mytype = 1", fn ->
+    assert_raise CompileError, %r"invalid type specification mytype = 1", fn ->
       test_module do
         @opaque mytype = 1
       end
     end
   end
 
   test "invalid function specification" do
-    assert_raise ArgumentError, "invalid function type specification myfun = 1", fn ->
+    assert_raise CompileError, %r"invalid function type specification myfun = 1", fn ->
       test_module do
         @spec myfun = 1
       end