More cleanup: remove compatibility code for OTP26- (#15166)

* Remove compatibility code for OTP26-

* Remove support for application/erlang+html docs v1

* Remove workaround for bug in older OTP versions

* Update OTP version checks

* Remove OTP25- skipping in tests

* More test cleanup

Author: sabiwara

Makefile

@@ -32,9 +32,9 @@ SOURCE_DATE_EPOCH_FILE = $(SOURCE_DATE_EPOCH_PATH)/SOURCE_DATE_EPOCH
 #==> Functions
 
 define CHECK_ERLANG_RELEASE
-	erl -noshell -eval '{V,_} = string:to_integer(erlang:system_info(otp_release)), io:fwrite("~s", [is_integer(V) and (V >= 26)])' -s erlang halt | grep -q '^true'; \
+	erl -noshell -eval '{V,_} = string:to_integer(erlang:system_info(otp_release)), io:fwrite("~s", [is_integer(V) and (V >= 27)])' -s erlang halt | grep -q '^true'; \
 		if [ $$? != 0 ]; then \
-		  echo "At least Erlang/OTP 26.0 is required to build Elixir"; \
+		  echo "At least Erlang/OTP 27.0 is required to build Elixir"; \
 		  exit 1; \
 		fi
 endef

lib/elixir/lib/float.ex

@@ -379,8 +379,8 @@ defmodule Float do
         case rounding do
           :ceil when sign === 0 -> 1 / power_of_10(precision)
           :floor when sign === 1 -> -1 / power_of_10(precision)
-          :ceil when sign === 1 -> minus_zero()
-          :half_up when sign === 1 -> minus_zero()
+          :ceil when sign === 1 -> -0.0
+          :half_up when sign === 1 -> -0.0
           _ -> 0.0
         end
 
@@ -411,7 +411,7 @@ defmodule Float do
 
         cond do
           num == 0 and sign == 1 ->
-            minus_zero()
+            -0.0
 
           num == 0 ->
             0.0
@@ -427,11 +427,6 @@ defmodule Float do
     end
   end
 
-  # TODO remove once we require Erlang/OTP 27+
-  # This function tricks the compiler to avoid this bug in previous versions:
-  # https://github.com/elixir-lang/elixir/blob/main/lib/elixir/lib/float.ex#L408-L412
-  defp minus_zero, do: -0.0
-
   defp decompose(significant, initial) do
     decompose(significant, 1, 0, initial)
   end

lib/elixir/src/elixir.erl

@@ -133,20 +133,20 @@ preload_common_modules() ->
 parse_otp_release() ->
   %% Whenever we change this check, we should also change Makefile.
   case string:to_integer(erlang:system_info(otp_release)) of
-    {Num, _} when Num >= 26 ->
+    {Num, _} when Num >= 27 ->
       case Num == 28 andalso (code:ensure_loaded(re) == {module, re}) andalso not erlang:function_exported(re, import, 1) of
         true ->
           io:format(standard_error,
             "warning! Erlang/OTP 28.0 detected.~n"
             "Regexes will be re-compiled from source at runtime, which will cause degraded performance.~n"
-            "This can be fixed by using Erlang OTP 28.1+ or 27-.~n"
+            "This can be fixed by using Erlang OTP 28.1+ or 27.~n"
           , []);
         false ->
           ok
       end,
       Num;
     _ ->
-      io:format(standard_error, "ERROR! Unsupported Erlang/OTP version, expected Erlang/OTP 26+~n", []),
+      io:format(standard_error, "ERROR! Unsupported Erlang/OTP version, expected Erlang/OTP 27+~n", []),
       erlang:halt(1)
   end.
 

lib/elixir/test/elixir/code_test.exs

@@ -739,26 +739,21 @@ defmodule Code.SyncTest do
 
   import PathHelpers
 
-  if System.otp_release() >= "26" do
-    defp assert_cached(path) do
-      assert find_path(path) != :nocache
-    end
+  defp assert_cached(path) do
+    assert find_path(path) != :nocache
+  end
 
-    defp refute_cached(path) do
-      assert find_path(path) == :nocache
-    end
+  defp refute_cached(path) do
+    assert find_path(path) == :nocache
+  end
 
-    defp find_path(path) do
-      {:status, _, {:module, :code_server}, [_, :running, _, _, state]} =
-        :sys.get_status(:code_server)
+  defp find_path(path) do
+    {:status, _, {:module, :code_server}, [_, :running, _, _, state]} =
+      :sys.get_status(:code_server)
 
-      [:state, _, _otp_root, paths | _] = Tuple.to_list(state)
-      {_, value} = List.keyfind(paths, to_charlist(path), 0)
-      value
-    end
-  else
-    defp assert_cached(_path), do: :ok
-    defp refute_cached(_path), do: :ok
+    [:state, _, _otp_root, paths | _] = Tuple.to_list(state)
+    {_, value} = List.keyfind(paths, to_charlist(path), 0)
+    value
   end
 
   test "evaluates module definitions" do

lib/elixir/test/elixir/kernel/cli_test.exs

@@ -95,25 +95,6 @@ defmodule Kernel.CLI.ExecutableTest do
     # Check for -e and exclamation mark handling on Windows
     assert {_output, 0} =
              System.cmd(elixir_executable(context.cli_extension), ["-e", "Time.new!(0, 0, 0)"])
-
-    # TODO: remove this once we bump CI to Erlang/OTP 27
-    if not (windows?() and System.otp_release() == "26") do
-      {output, 0} =
-        System.cmd(iex_executable(context.cli_extension), [
-          "--eval",
-          "IO.puts :hello_world123; System.halt()"
-        ])
-
-      assert output =~ "hello_world123"
-
-      {output, 0} =
-        System.cmd(iex_executable(context.cli_extension), [
-          "-e",
-          "IO.puts :hello_world123; System.halt()"
-        ])
-
-      assert output =~ "hello_world123"
-    end
   end
 
   @tag :unix

lib/iex/lib/iex/config.ex

@@ -26,21 +26,10 @@ defmodule IEx.Config do
     case Enum.split_while(prompt, &(&1 != ?()) do
       # It is not the default Elixir shell, so we use the default prompt
       {_, []} ->
-        List.duplicate(?\s, max(0, prompt_width(prompt) - 3)) ++ ~c".. "
+        List.duplicate(?\s, max(0, :shell.prompt_width(prompt) - 3)) ++ ~c".. "
 
       {left, right} ->
-        List.duplicate(?., prompt_width(left)) ++ right
-    end
-  end
-
-  # TODO: Remove this when we require Erlang/OTP 27+
-  @compile {:no_warn_undefined, :prim_tty}
-  @compile {:no_warn_undefined, :shell}
-  defp prompt_width(prompt) do
-    if function_exported?(:prim_tty, :npwcwidthstring, 1) do
-      :prim_tty.npwcwidthstring(prompt)
-    else
-      :shell.prompt_width(prompt)
+        List.duplicate(?., :shell.prompt_width(left)) ++ right
     end
   end
 

lib/iex/lib/iex/introspection.ex

@@ -274,10 +274,6 @@ defmodule IEx.Introspection do
     case Code.ensure_loaded(module) do
       {:module, _} ->
         case Code.fetch_docs(module) do
-          # TODO remove once we require Erlang/OTP 27+
-          {:docs_v1, _, :erlang, "application/erlang+html", _, _, _} = erl_docs ->
-            :shell_docs.render(module, erl_docs) |> IO.puts()
-
           {:docs_v1, _, _, format, doc, metadata, _} when is_map(doc) or doc == :none ->
             print_doc([inspect(module)], [], format, doc, metadata)
 
@@ -298,7 +294,7 @@ defmodule IEx.Introspection do
   def h({module, function}) when is_atom(module) and is_atom(function) do
     case Code.ensure_loaded(module) do
       {:module, _} ->
-        {_language, _format, docs, _} = get_docs(module, [:function, :macro])
+        {_language, _format, docs} = get_docs(module, [:function, :macro])
 
         exports =
           cond do
@@ -390,15 +386,10 @@ defmodule IEx.Introspection do
   end
 
   defp h_mod_fun_arity(mod, fun, arity) when is_atom(mod) do
-    {language, format, docs, docs_v1} = get_docs(mod, [:function, :macro])
+    {language, format, docs} = get_docs(mod, [:function, :macro])
     spec = get_spec(mod, fun, arity)
 
     cond do
-      # TODO remove once we require Erlang/OTP 27+
-      language == :erlang and format == "application/erlang+html" ->
-        print_erlang_doc(mod, fun, arity, docs_v1)
-        :ok
-
       doc_tuple = find_doc_with_content(docs, fun, arity) ->
         print_fun(mod, language, format, doc_tuple, spec)
         :ok
@@ -432,23 +423,23 @@ defmodule IEx.Introspection do
   end
 
   defp has_type?(mod, fun) do
-    {_, _, docs, _} = get_docs(mod, [:type])
+    {_, _, docs} = get_docs(mod, [:type])
     Enum.any?(docs, &match?({_, ^fun, _}, elem(&1, 0)))
   end
 
   defp has_type?(mod, fun, arity) do
-    {_, _, docs, _} = get_docs(mod, [:type])
+    {_, _, docs} = get_docs(mod, [:type])
     Enum.any?(docs, &match?({_, ^fun, ^arity}, elem(&1, 0)))
   end
 
   defp get_docs(mod, kinds) do
     case Code.fetch_docs(mod) do
-      {:docs_v1, _, language, format, _, _, docs} = docs_v1 ->
+      {:docs_v1, _, language, format, _, _, docs} ->
         docs = for {{kind, _, _}, _, _, _, _} = doc <- docs, kind in kinds, do: doc
-        {language, format, docs, docs_v1}
+        {language, format, docs}
 
       {:error, _} ->
-        {nil, nil, nil, nil}
+        {nil, nil, nil}
     end
   end
 
@@ -588,7 +579,7 @@ defmodule IEx.Introspection do
   end
 
   defp get_callback_docs(mod, filter) do
-    {_, format, docs, _} = get_docs(mod, [:callback, :macrocallback])
+    {_, format, docs} = get_docs(mod, [:callback, :macrocallback])
 
     case Typespec.fetch_callbacks(mod) do
       :error ->
@@ -677,95 +668,72 @@ defmodule IEx.Introspection do
   Prints the types for the given module and type documentation.
   """
   def t(module) when is_atom(module) do
-    case :code.get_doc(module) do
-      # TODO remove once we require Erlang/OTP 27+
-      {:ok, {:docs_v1, _, :erlang, "application/erlang+html", _, _, _} = erl_docs} ->
-        :shell_docs.render_type(module, erl_docs) |> IO.puts()
-
-      _ ->
-        case Typespec.fetch_types(module) do
-          :error ->
-            no_beam(module)
+    case Typespec.fetch_types(module) do
+      :error ->
+        no_beam(module)
 
-          {:ok, []} ->
-            types_not_found(inspect(module))
+      {:ok, []} ->
+        types_not_found(inspect(module))
 
-          {:ok, types} ->
-            types
-            |> Enum.sort_by(fn {_, {name, _, args}} -> {name, length(args)} end)
-            |> Enum.each(&(&1 |> format_type() |> IO.puts()))
-        end
+      {:ok, types} ->
+        types
+        |> Enum.sort_by(fn {_, {name, _, args}} -> {name, length(args)} end)
+        |> Enum.each(&(&1 |> format_type() |> IO.puts()))
     end
 
     dont_display_result()
   end
 
   def t({module, type}) when is_atom(module) and is_atom(type) do
-    case get_docs(module, [:type]) do
-      # TODO remove once we require Erlang/OTP 27+
-      {:erlang, "application/erlang+html", _, erl_docs} ->
-        case :shell_docs.render_type(module, type, erl_docs) do
-          {:error, :type_missing} -> types_not_found_or_private("#{inspect(module)}.#{type}")
-          iodata -> IO.puts(iodata)
-        end
+    {_, format, docs} = get_docs(module, [:type])
 
-      {_, format, docs, _} ->
-        case Typespec.fetch_types(module) do
-          :error ->
-            no_beam(module)
-
-          {:ok, types} ->
-            types
-            |> Enum.filter(&match?({kind, {^type, _, _}} when kind in [:type, :opaque], &1))
-            |> Enum.sort_by(fn {_, {name, _, args}} -> {name, length(args)} end)
-            |> case do
-              [] ->
-                types_not_found_or_private("#{inspect(module)}.#{type}")
-
-              types ->
-                Enum.map(types, fn {_, {_, _, args}} = typespec ->
-                  type
-                  |> type_doc(length(args), typespec, format, docs)
-                  |> print_typespec()
-                end)
-            end
+    case Typespec.fetch_types(module) do
+      :error ->
+        no_beam(module)
+
+      {:ok, types} ->
+        types
+        |> Enum.filter(&match?({kind, {^type, _, _}} when kind in [:type, :opaque], &1))
+        |> Enum.sort_by(fn {_, {name, _, args}} -> {name, length(args)} end)
+        |> case do
+          [] ->
+            types_not_found_or_private("#{inspect(module)}.#{type}")
+
+          types ->
+            Enum.map(types, fn {_, {_, _, args}} = typespec ->
+              type
+              |> type_doc(length(args), typespec, format, docs)
+              |> print_typespec()
+            end)
         end
     end
 
     dont_display_result()
   end
 
   def t({module, type, arity}) when is_atom(module) and is_atom(type) and is_integer(arity) do
-    case get_docs(module, [:type]) do
-      # TODO remove once we require Erlang/OTP 27+
-      {:erlang, "application/erlang+html", _, erl_docs} ->
-        case :shell_docs.render_type(module, type, arity, erl_docs) do
-          {:error, :type_missing} -> types_not_found_or_private("#{inspect(module)}.#{type}")
-          chardata -> IO.puts(chardata)
-        end
+    {_, format, docs} = get_docs(module, [:type])
 
-      {_, format, docs, _} ->
-        case Typespec.fetch_types(module) do
-          :error ->
-            no_beam(module)
-
-          {:ok, types} ->
-            types
-            |> Enum.find(
-              &match?(
-                {kind, {^type, _, args}} when kind in [:type, :opaque] and length(args) == arity,
-                &1
-              )
-            )
-            |> case do
-              nil ->
-                types_not_found_or_private("#{inspect(module)}.#{type}")
-
-              typespec ->
-                type
-                |> type_doc(arity, typespec, format, docs)
-                |> print_typespec()
-            end
+    case Typespec.fetch_types(module) do
+      :error ->
+        no_beam(module)
+
+      {:ok, types} ->
+        types
+        |> Enum.find(
+          &match?(
+            {kind, {^type, _, args}} when kind in [:type, :opaque] and length(args) == arity,
+            &1
+          )
+        )
+        |> case do
+          nil ->
+            types_not_found_or_private("#{inspect(module)}.#{type}")
+
+          typespec ->
+            type
+            |> type_doc(arity, typespec, format, docs)
+            |> print_typespec()
         end
     end
 
@@ -841,20 +809,6 @@ defmodule IEx.Introspection do
   defp translate_doc(%{"en" => doc}), do: doc
   defp translate_doc(_), do: nil
 
-  defp print_erlang_doc(mod, fun, arity, docs) do
-    heading = Exception.format_mfa(mod, fun, arity)
-    opts = IEx.Config.ansi_docs()
-
-    case :shell_docs.render(mod, fun, arity, docs) do
-      {:error, :function_missing} ->
-        docs_not_found("#{inspect(mod)}.#{fun}")
-
-      chardata ->
-        IO.ANSI.Docs.print_headings([heading], opts)
-        IO.puts(chardata)
-    end
-  end
-
   defp no_beam(module) do
     case Code.ensure_loaded(module) do
       {:module, _} ->