Remove code for 1.10 support

sabiwara · Nov 10, 2024 · 11410e3 · 11410e3
1 parent 9c63f4f
commit 11410e3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 27 deletions.
diff --git a/lib/aja.ex b/lib/aja.ex
@@ -150,8 +150,7 @@ defmodule Aja do
 
       :guard ->
         quote do
-          # TODO simplify when stop supporting Elixir 1.10
-          :erlang.map_get(:__ord_map__, unquote(ord_map)) |> :erlang.map_size()
+          unquote(ord_map).__ord_map__ |> :erlang.map_size()
         end
     end
   end
@@ -336,8 +335,7 @@ defmodule Aja do
         quote do
           :erlang.element(
             1,
-            # TODO simplify when stop supporting Elixir 1.10
-            :erlang.map_get(:__vector__, unquote(vector))
+            unquote(vector).__vector__
           )
         end
     end

diff --git a/lib/ord_map.ex b/lib/ord_map.ex
@@ -208,9 +208,7 @@ defmodule Aja.OrdMap do
 
   @doc false
   defguard is_dense(ord_map)
-           # TODO simplify when stop supporting Elixir 1.10
-           when :erlang.map_get(:__ord_map__, ord_map) |> map_size() ===
-                  :erlang.map_get(:__ord_vector__, ord_map) |> RawVector.size()
+           when map_size(ord_map.__ord_map__) === RawVector.size(ord_map.__ord_vector__)
 
   @doc """
   Returns the number of keys in `ord_map`.

diff --git a/lib/string.ex b/lib/string.ex
@@ -52,29 +52,11 @@ defmodule Aja.String do
   end
 
   defp normalize(string, :ascii) do
-    for <<c <- nfkd_normalize(string)>>, c in 0..127, into: "", do: <<c>>
+    for <<c <- String.normalize(string, :nfkd)>>, c in 0..127, into: "", do: <<c>>
   end
 
   defp normalize(string, _mode) do
-    nfkc_normalize(string)
-  end
-
-  defp nfkc_normalize(string) do
-    # Note: same implementation as `String.normalize(string, :nfkc)` in Elixir 1.11
-    # TODO replace when removing support for 1.10
-    case :unicode.characters_to_nfkc_binary(string) do
-      normalized when is_binary(normalized) -> normalized
-      {:error, good, <<head, rest::binary>>} -> good <> <<head>> <> nfkc_normalize(rest)
-    end
-  end
-
-  defp nfkd_normalize(string) do
-    # Note: same implementation as `String.normalize(string, :nfkd)` in Elixir 1.11
-    # TODO replace when removing support for 1.10
-    case :unicode.characters_to_nfkd_binary(string) do
-      normalized when is_binary(normalized) -> normalized
-      {:error, good, <<head, rest::binary>>} -> good <> <<head>> <> nfkd_normalize(rest)
-    end
+    String.normalize(string, :nfkc)
   end
 
   defp try_replace(string, regex, new) do