Remove not used code (#6064)

phoenixframework · Jan 26, 2025 · 1934500 · 1934500
1 parent 05a6299
commit 1934500
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/lib/phoenix/router/route.ex b/lib/phoenix/router/route.ex
@@ -177,15 +177,9 @@ defmodule Phoenix.Router.Route do
     match_all = match_params ++ match_private ++ match_assigns
     merge_all = merge_params ++ merge_private ++ merge_assigns
 
-    if merge_all != [] do
-      quote do
-        %{unquote_splicing(match_all)} = var!(conn, :conn)
-        %{var!(conn, :conn) | unquote_splicing(merge_all)}
-      end
-    else
-      quote do
-        var!(conn, :conn)
-      end
+    quote do
+      %{unquote_splicing(match_all)} = var!(conn, :conn)
+      %{var!(conn, :conn) | unquote_splicing(merge_all)}
     end
   end