Remove list guard in Plug.Conn.merge_assigns and merge_private (#1152)

elixir-plug · Jun 24, 2023 · 7b859ef · 7b859ef
1 parent c30c454
commit 7b859ef
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/plug/conn.ex b/lib/plug/conn.ex
@@ -330,9 +330,9 @@ defmodule Plug.Conn do
       :world
 
   """
-  @spec merge_assigns(t, Keyword.t()) :: t
-  def merge_assigns(%Conn{assigns: assigns} = conn, keyword) when is_list(keyword) do
-    %{conn | assigns: Enum.into(keyword, assigns)}
+  @spec merge_assigns(t, Enumerable.t()) :: t
+  def merge_assigns(%Conn{assigns: assigns} = conn, new) do
+    %{conn | assigns: Enum.into(new, assigns)}
   end
 
   @doc false
@@ -384,9 +384,9 @@ defmodule Plug.Conn do
       :world
 
   """
-  @spec merge_private(t, Keyword.t()) :: t
-  def merge_private(%Conn{private: private} = conn, keyword) when is_list(keyword) do
-    %{conn | private: Enum.into(keyword, private)}
+  @spec merge_private(t, Enumerable.t()) :: t
+  def merge_private(%Conn{private: private} = conn, new) do
+    %{conn | private: Enum.into(new, private)}
   end
 
   @doc """