PR review fixes

Author: lukaszsamson

lib/elixir/lib/macro/env.ex

@@ -96,7 +96,8 @@ defmodule Macro.Env do
         ]
 
   @type expand_import_opts :: [
-          allow_locals: boolean() | (Macro.metadata(), atom(), arity(), [atom()], t() -> any()),
+          allow_locals:
+            boolean() | (Macro.metadata(), atom(), arity(), t() -> function() | false),
           check_deprecations: boolean(),
           trace: boolean()
         ]
@@ -563,9 +564,7 @@ defmodule Macro.Env do
       - When `true`, uses a default resolver that looks for public macros in
         the current module
       - When a function, uses the function as a custom local resolver. The function
-        must have the signature: `(meta, name, arity, kinds, env) -> function() | false`
-        where `kinds` is a list of atoms indicating the types of symbols being
-        searched (e.g., `[:defmacro, :defmacrop]`)
+        must have the signature: `(meta, name, arity, env) -> function() | false`
 
     * `:check_deprecations` - when set to `false`, does not check for deprecations
       when expanding macros
@@ -592,7 +591,7 @@ defmodule Macro.Env do
         # When allow_locals is a callback, we don't need to pass module macros as extra
         # because the callback will handle local macro resolution
         extra =
-          if is_function(allow_locals, 5) do
+          if is_function(allow_locals, 4) do
             []
           else
             case allow_locals and function_exported?(module, :__info__, 1) do

lib/elixir/src/elixir_dispatch.erl

@@ -175,9 +175,9 @@ expand_import(Meta, Name, Arity, E, Extra, AllowLocals, Trace) ->
       Local = case AllowLocals of
         false -> false;
         true  -> elixir_def:local_for(Meta, Name, Arity, [defmacro, defmacrop], E);
-        Fun when is_function(Fun, 5) ->
+        Fun when is_function(Fun, 4) ->
           %% If we have a custom local resolver, use it.
-          Fun(Meta, Name, Arity, [defmacro, defmacrop], E)
+          Fun(Meta, Name, Arity, E)
       end,
 
       case Dispatch of