Remove TODOs after Elixir v1.14+

Author: josevalim

lib/plug/conn/query.ex

@@ -143,22 +143,15 @@ defmodule Plug.Conn.Query do
   end
 
   defp decode_www_form(value, invalid_exception, validate_utf8) do
-    # TODO: Remove rescue as this can't fail from Elixir v1.13
-    try do
-      URI.decode_www_form(value)
-    rescue
-      ArgumentError ->
-        raise invalid_exception, "invalid urlencoded params, got #{value}"
-    else
-      binary ->
-        case validate_utf8 do
-          true -> Plug.Conn.Utils.validate_utf8!(binary, invalid_exception, "urlencoded params")
-          false -> :ok
-          module -> Plug.Conn.Utils.validate_utf8!(binary, module, "urlencoded params")
-        end
-
-        binary
+    binary = URI.decode_www_form(value)
+
+    case validate_utf8 do
+      true -> Plug.Conn.Utils.validate_utf8!(binary, invalid_exception, "urlencoded params")
+      false -> :ok
+      module -> Plug.Conn.Utils.validate_utf8!(binary, module, "urlencoded params")
     end
+
+    binary
   end
 
   @doc """

lib/plug/parsers/multipart.ex

@@ -146,12 +146,6 @@ defmodule Plug.Parsers.MULTIPART do
 
   ## Multipart
 
-  defp parse_multipart(conn, {m2p, {module, fun, args}, header_opts, opts}) do
-    # TODO: Remove me once the deprecation is removed
-    limit = apply(module, fun, args)
-    parse_multipart(conn, {m2p, limit, header_opts, opts})
-  end
-
   defp parse_multipart(conn, {m2p, limit, headers_opts, opts}) do
     read_result = Plug.Conn.read_part_headers(conn, headers_opts)
     {:ok, limit, acc, conn} = parse_multipart(read_result, limit, opts, headers_opts, [])

lib/plug/router/utils.ex

@@ -13,14 +13,7 @@ defmodule Plug.Router.Utils do
   Decodes path information for dispatching.
   """
   def decode_path_info!(conn) do
-    # TODO: Remove rescue as this can't fail from Elixir v1.13
-    try do
-      Enum.map(conn.path_info, &URI.decode/1)
-    rescue
-      e in ArgumentError ->
-        reason = %Plug.Router.MalformedURIError{message: e.message}
-        Plug.Conn.WrapperError.reraise(conn, :error, reason, __STACKTRACE__)
-    end
+    Enum.map(conn.path_info, &URI.decode/1)
   end
 
   @doc """

lib/plug/static.ex

@@ -187,7 +187,7 @@ defmodule Plug.Static do
     segments = subset(at, conn.path_info)
 
     if allowed?(only_rules, segments) do
-      segments = Enum.map(segments, &uri_decode/1)
+      segments = Enum.map(segments, &URI.decode/1)
 
       if invalid_path?(segments) do
         raise InvalidPathError, "invalid path for static asset: #{conn.request_path}"
@@ -206,16 +206,6 @@ defmodule Plug.Static do
     conn
   end
 
-  defp uri_decode(path) do
-    # TODO: Remove rescue as this can't fail from Elixir v1.13
-    try do
-      URI.decode(path)
-    rescue
-      ArgumentError ->
-        raise InvalidPathError
-    end
-  end
-
   defp allowed?(_only_rules, []), do: false
   defp allowed?({[], []}, _list), do: true
 

mix.exs

@@ -10,7 +10,7 @@ defmodule Plug.MixProject do
     [
       app: :plug,
       version: @version,
-      elixir: "~> 1.10",
+      elixir: "~> 1.14",
       deps: deps(),
       package: package(),
       description: @description,

src/plug_multipart.erl

@@ -365,7 +365,7 @@ form_data(Headers) ->
         false -> <<"text/plain">>;
         {_, T} -> T
       end,
-      %% @todo Turns out this is unnecessary per RFC7578 4.7.
+      %% Turns out this is unnecessary per RFC7578 4.7.
       TransferEncoding = case lists:keyfind(
           <<"content-transfer-encoding">>, 1, Headers) of
         false -> <<"7bit">>;