summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@dashbit.co>2021-12-06 15:16:13 +0100
committerJosé Valim <jose.valim@dashbit.co>2021-12-06 15:16:13 +0100
commit853fd9b6b80c26146c64ee021c3120ff1a01ba6c (patch)
treeab6e42c9ee30d75bd2ce0a483322fae7513aa3c1
parentaa41c880863f1852149626c9103b901e3a6db5e4 (diff)
downloadelixir-853fd9b6b80c26146c64ee021c3120ff1a01ba6c.tar.gz
Only check for path as nil
-rw-r--r--lib/elixir/lib/uri.ex3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/elixir/lib/uri.ex b/lib/elixir/lib/uri.ex
index 1535e0086..29681b4ad 100644
--- a/lib/elixir/lib/uri.ex
+++ b/lib/elixir/lib/uri.ex
@@ -892,8 +892,7 @@ defmodule URI do
%{rel | scheme: base.scheme, path: remove_dot_segments_from_path(rel.path)}
end
- # TODO: Check only for nils in future versions
- def merge(%URI{} = base, %URI{path: rel_path} = rel) when rel_path in ["", nil] do
+ def merge(%URI{} = base, %URI{path: nil} = rel) do
%{base | query: rel.query || base.query, fragment: rel.fragment}
end