Remove TODOs related to Erlang/OTP 22+

Author: josevalim

lib/elixir/src/elixir.hrl

@@ -30,11 +30,3 @@
   warn_on_unnecessary_quotes=true,
   warnings=[]
 }).
-
-%% TODO: Remove this once we support Erlang/OTP 22+ exclusively.
-%% See https://github.com/erlang/otp/pull/1972
--if(?OTP_RELEASE >= 22).
-  -define(NO_SPAWN_COMPILER_PROCESS, no_spawn_compiler_process).
--else.
-  -define(NO_SPAWN_COMPILER_PROCESS, dialyzer, no_spawn_compiler_process).
--endif.

lib/elixir/src/elixir_erl.erl

@@ -23,7 +23,7 @@ debug_info(core_v1, _Module, {elixir_v1, Map, Specs}, Opts) ->
   %% warnings nor the other functionality provided there.
   case elixir_erl_compiler:erl_to_core(Prefix ++ Specs ++ Forms, AllOpts) of
     {ok, CoreForms, _} ->
-      try compile:noenv_forms(CoreForms, [?NO_SPAWN_COMPILER_PROCESS, from_core, core, return | AllOpts]) of
+      try compile:noenv_forms(CoreForms, [no_spawn_compiler_process, from_core, core, return | AllOpts]) of
         {ok, _, Core, _} -> {ok, Core};
         _What -> {error, failed_conversion}
       catch

lib/elixir/src/elixir_erl_compiler.erl

@@ -36,7 +36,7 @@ erl_to_core(Forms, Opts) ->
     [] ->
       v3_core:module(Forms, Opts);
     _ ->
-      case compile:noenv_forms(Forms, [?NO_SPAWN_COMPILER_PROCESS, to_core0, return, no_auto_import | Opts]) of
+      case compile:noenv_forms(Forms, [no_spawn_compiler_process, to_core0, return, no_auto_import | Opts]) of
         {ok, _Module, Core, Warnings} -> {ok, Core, Warnings};
         {error, Errors, Warnings} -> {error, Errors, Warnings}
       end
@@ -48,7 +48,7 @@ compile(Forms, File, Opts) when is_list(Forms), is_list(Opts), is_binary(File) -
   case erl_to_core(Forms, Opts) of
     {ok, CoreForms, CoreWarnings} ->
       format_warnings(Opts, CoreWarnings),
-      CompileOpts = [?NO_SPAWN_COMPILER_PROCESS, from_core, no_core_prepare,
+      CompileOpts = [no_spawn_compiler_process, from_core, no_core_prepare,
                      no_auto_import, return, {source, Source} | Opts],
 
       case compile:noenv_forms(CoreForms, CompileOpts) of

lib/logger/lib/logger/app.ex

@@ -9,21 +9,21 @@ defmodule Logger.App do
   def start(_type, _args) do
     start_options = Application.get_env(:logger, :start_options)
     otp_reports? = Application.fetch_env!(:logger, :handle_otp_reports)
-    config = Logger.Counter.new()
+    counter = :counters.new(1, [:atomics])
 
     children = [
       %{
         id: :gen_event,
         start: {:gen_event, :start_link, [{:local, Logger}, start_options]},
         modules: :dynamic
       },
-      {Logger.Watcher, {Logger.Config, config}},
+      {Logger.Watcher, {Logger.Config, counter}},
       Logger.BackendSupervisor
     ]
 
     case Supervisor.start_link(children, strategy: :rest_for_one, name: Logger.Supervisor) do
       {:ok, sup} ->
-        primary_config = add_elixir_handler(otp_reports?, config)
+        primary_config = add_elixir_handler(otp_reports?, counter)
 
         default_handlers =
           if otp_reports? do
@@ -33,10 +33,9 @@ defmodule Logger.App do
           end
 
         handlers = [{:primary, primary_config} | default_handlers]
-        {:ok, sup, {config, handlers}}
+        {:ok, sup, handlers}
 
       {:error, _} = error ->
-        Logger.Counter.delete(config)
         error
     end
   end
@@ -47,12 +46,10 @@ defmodule Logger.App do
   end
 
   @doc false
-  def stop({config, handlers}) do
+  def stop(handlers) do
     _ = :logger.remove_handler(Logger)
     _ = :logger.remove_primary_filter(:process_disabled)
-
     add_handlers(handlers)
-    Logger.Counter.delete(config)
 
     :logger.add_primary_filter(
       :silence_logger_exit,

lib/logger/lib/logger/config.ex

@@ -5,8 +5,6 @@ defmodule Logger.Config do
   @name __MODULE__
   @update_counter_message {__MODULE__, :update_counter}
 
-  alias Logger.Counter
-
   def configure(options) do
     :gen_event.call(Logger, @name, {:configure, options})
   end
@@ -76,6 +74,8 @@ defmodule Logger.Config do
     {:ok, state}
   end
 
+  @counter_pos 1
+
   defp update_counter({counter, log, discard_threshold, discard_period}, periodic_check?) do
     # If length is more than the total, it means the counter is behind,
     # due to non-log messages, so we need to increase the counter.
@@ -88,9 +88,9 @@ defmodule Logger.Config do
     # deliver the message yet. Those bumps will be lost. At the same time,
     # we are careful to read the counter first here, so if the counter is
     # bumped after we read from it, those bumps won't be lost.
-    total = Counter.read(counter)
+    total = :counters.get(counter, @counter_pos)
     {:message_queue_len, length} = Process.info(self(), :message_queue_len)
-    Counter.add(counter, length - total)
+    :counters.add(counter, @counter_pos, length - total)
 
     # In case we are logging but we reached the threshold, we log that we
     # started discarding messages. This can only be reverted by the periodic
@@ -128,7 +128,6 @@ defmodule Logger.Config do
     {:ok, %{config: data}} = :logger.get_handler_config(Logger)
     translators = fun.(data.translators)
     Application.put_env(:logger, :translators, translators)
-    # TODO: Use update_handler_config on Erlang/OTP 22+.
-    :ok = :logger.set_handler_config(Logger, :config, %{data | translators: translators})
+    :ok = :logger.update_handler_config(Logger, :config, translators: translators)
   end
 end

lib/logger/lib/logger/counter.ex

@@ -1,6 +1,5 @@
 defmodule Logger.Handler do
   @moduledoc false
-  alias Logger.Counter
 
   @internal_keys [:counter]
 
@@ -28,9 +27,6 @@ defmodule Logger.Handler do
     {:ok, update_in(config.config, &Map.merge(default_config(), &1))}
   end
 
-  # TODO: Remove this once we support Erlang/OTP 22+ exclusively.
-  def changing_config(current, new), do: changing_config(:set, current, new)
-
   def changing_config(
         op,
         %{config: %{counter: counter} = old_data} = old_config,
@@ -169,13 +165,16 @@ defmodule Logger.Handler do
   defp truncate(data, n) when is_binary(data), do: Logger.Utils.truncate(data, n)
   defp truncate(data, n), do: Logger.Utils.truncate(to_string(data), n)
 
+  @counter_pos 1
+
   defp threshold(config) do
     %{
       counter: counter,
       thresholds: {sync, discard}
     } = config
 
-    value = Counter.bump(counter)
+    :counters.add(counter, @counter_pos, 1)
+    value = :counters.get(counter, @counter_pos)
 
     cond do
       value >= discard -> :discard