diff options
| -rw-r--r-- | lib/elixir/lib/uri.ex | 3 |
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 |