Skip to content

Commit 1934500

Browse files
authored
Remove not used code (#6064)
1 parent 05a6299 commit 1934500

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

lib/phoenix/router/route.ex

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -177,15 +177,9 @@ defmodule Phoenix.Router.Route do
177177
match_all = match_params ++ match_private ++ match_assigns
178178
merge_all = merge_params ++ merge_private ++ merge_assigns
179179

180-
if merge_all != [] do
181-
quote do
182-
%{unquote_splicing(match_all)} = var!(conn, :conn)
183-
%{var!(conn, :conn) | unquote_splicing(merge_all)}
184-
end
185-
else
186-
quote do
187-
var!(conn, :conn)
188-
end
180+
quote do
181+
%{unquote_splicing(match_all)} = var!(conn, :conn)
182+
%{var!(conn, :conn) | unquote_splicing(merge_all)}
189183
end
190184
end
191185

0 commit comments

Comments
 (0)