File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -330,9 +330,9 @@ defmodule Plug.Conn do
330
330
:world
331
331
332
332
"""
333
- @ spec merge_assigns ( t , Keyword . t ( ) ) :: t
334
- def merge_assigns ( % Conn { assigns: assigns } = conn , keyword ) when is_list ( keyword ) do
335
- % { conn | assigns: Enum . into ( keyword , assigns ) }
333
+ @ spec merge_assigns ( t , Enumerable . t ( ) ) :: t
334
+ def merge_assigns ( % Conn { assigns: assigns } = conn , new ) do
335
+ % { conn | assigns: Enum . into ( new , assigns ) }
336
336
end
337
337
338
338
@ doc false
@@ -384,9 +384,9 @@ defmodule Plug.Conn do
384
384
:world
385
385
386
386
"""
387
- @ spec merge_private ( t , Keyword . t ( ) ) :: t
388
- def merge_private ( % Conn { private: private } = conn , keyword ) when is_list ( keyword ) do
389
- % { conn | private: Enum . into ( keyword , private ) }
387
+ @ spec merge_private ( t , Enumerable . t ( ) ) :: t
388
+ def merge_private ( % Conn { private: private } = conn , new ) do
389
+ % { conn | private: Enum . into ( new , private ) }
390
390
end
391
391
392
392
@ doc """
You can’t perform that action at this time.
0 commit comments