Ensure we can define a nested record named Record, closes #1133

Author: José Valim

lib/elixir/lib/record.ex

@@ -30,7 +30,7 @@ defmodule Record do
 
       defmodule unquote(name) do
         @moduledoc false
-        import Record.DSL
+        import Elixir.Record.DSL
 
         @record_fields []
         @record_types  []
@@ -39,9 +39,9 @@ defmodule Record do
         # avoid conflicts in nested records
         values = unquoted_values
 
-        Record.deffunctions(values, __ENV__)
+        Elixir.Record.deffunctions(values, __ENV__)
         value = unquote(block)
-        Record.deftypes(values, @record_types, __ENV__)
+        Elixir.Record.deftypes(values, @record_types, __ENV__)
         value
       end
     end

lib/elixir/test/elixir/record_test.exs

@@ -69,6 +69,10 @@ defmodule RecordTest.Macros do
     defrecord NestedInNested, it_compiles: true
   end
 
+  # Ensure there is no conflict in a nested module
+  # named record.
+  defrecord Record, [a: 1, b: 2]
+
   def new() do
     _user()
   end